|
 |
46b2f6 |
From 042554182bcc782527dc74e035e2efaf6eb38aa4 Mon Sep 17 00:00:00 2001
|
|
|
46b2f6 |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
46b2f6 |
Date: Mon, 8 Apr 2019 18:23:27 +0200
|
|
|
46b2f6 |
Subject: [PATCH] v2v: start reading the new libvirt firmware autoselect
|
|
|
46b2f6 |
|
|
|
46b2f6 |
Starting with 5.2.0, libvirt has a way to select automatically the
|
|
|
46b2f6 |
firmware for a guest using an attribute of the <os> tag. Hence, use
|
|
|
46b2f6 |
this information (when available, of course) to flag the firmware used
|
|
|
46b2f6 |
by the guest.
|
|
|
46b2f6 |
|
|
|
46b2f6 |
(cherry picked from commit fb7983f999004c1f8100776819ea65b21990956d)
|
|
|
46b2f6 |
---
|
|
|
46b2f6 |
v2v/parse_libvirt_xml.ml | 9 ++++++++-
|
|
|
46b2f6 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
46b2f6 |
|
|
|
46b2f6 |
diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml
|
|
|
46b2f6 |
index b9970cee8..14cd82afd 100644
|
|
|
46b2f6 |
--- a/v2v/parse_libvirt_xml.ml
|
|
|
46b2f6 |
+++ b/v2v/parse_libvirt_xml.ml
|
|
|
46b2f6 |
@@ -476,6 +476,13 @@ let parse_libvirt_xml ?conn xml =
|
|
|
46b2f6 |
done;
|
|
|
46b2f6 |
List.rev !nics in
|
|
|
46b2f6 |
|
|
|
46b2f6 |
+ (* Firmware. *)
|
|
|
46b2f6 |
+ let firmware =
|
|
|
46b2f6 |
+ match xpath_string "/domain/os/@firmware" with
|
|
|
46b2f6 |
+ | Some "bios" -> BIOS
|
|
|
46b2f6 |
+ | Some "efi" -> UEFI
|
|
|
46b2f6 |
+ | None | Some _ -> UnknownFirmware in
|
|
|
46b2f6 |
+
|
|
|
46b2f6 |
(* Check for hostdev devices. (RHBZ#1472719) *)
|
|
|
46b2f6 |
let () =
|
|
|
46b2f6 |
let obj = Xml.xpath_eval_expression xpathctx "/domain/devices/hostdev" in
|
|
|
46b2f6 |
@@ -520,7 +527,7 @@ let parse_libvirt_xml ?conn xml =
|
|
|
46b2f6 |
s_cpu_model = cpu_model;
|
|
|
46b2f6 |
s_cpu_topology = cpu_topology;
|
|
|
46b2f6 |
s_features = features;
|
|
|
46b2f6 |
- s_firmware = UnknownFirmware; (* XXX until RHBZ#1217444 is fixed *)
|
|
|
46b2f6 |
+ s_firmware = firmware;
|
|
|
46b2f6 |
s_display = display;
|
|
|
46b2f6 |
s_video = video;
|
|
|
46b2f6 |
s_sound = sound;
|
|
|
46b2f6 |
--
|
|
|
b155d0 |
2.26.2
|
|
|
46b2f6 |
|