The printf format string in "string_of_guestcaps" is hard to read, because it is not indented properly wrt. the rest of the source code. Indent it properly without changing its behavior. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1942325 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- lib/types.ml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/types.ml b/lib/types.ml index 894391baecaa..dc3308dc4d87 100644 --- a/lib/types.ml +++ b/lib/types.ml @@ -423,12 +423,13 @@ let string_of_machine = function let string_of_guestcaps gcaps = sprintf "\ -gcaps_block_bus = %s -gcaps_net_bus = %s -gcaps_machine = %s -gcaps_arch = %s -gcaps_acpi = %b -" (string_of_block_type gcaps.gcaps_block_bus) + gcaps_block_bus = %s\n\ + gcaps_net_bus = %s\n\ + gcaps_machine = %s\n\ + gcaps_arch = %s\n\ + gcaps_acpi = %b\n\ + " + (string_of_block_type gcaps.gcaps_block_bus) (string_of_net_type gcaps.gcaps_net_bus) (string_of_machine gcaps.gcaps_machine) gcaps.gcaps_arch -- 2.19.1.3.g30247aa5d201

Add a new field to the "guestcaps" record to track whether the guest supports the virtio devices that it does at the virtio-1.0 protocol level. Virt-v2v's current assumption is that virtio-1.0 is supported by any guest, namely for those virtio devices specifically that the guest supports -- which in fact may be the empty set. Make this assumption explicit by setting the new field to "true" in "convert/convert_linux.ml" and "convert/convert_windows.ml". Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1942325 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- lib/types.mli | 4 ++++ convert/convert_linux.ml | 1 + convert/convert_windows.ml | 1 + lib/types.ml | 3 +++ 4 files changed, 9 insertions(+) diff --git a/lib/types.mli b/lib/types.mli index 02913c0cb4a1..0b9b6e251585 100644 --- a/lib/types.mli +++ b/lib/types.mli @@ -270,6 +270,10 @@ type guestcaps = { gcaps_machine : guestcaps_machine; (** Machine model. *) gcaps_arch : string; (** Architecture that KVM must emulate. *) gcaps_acpi : bool; (** True if guest supports acpi. *) + + gcaps_virtio_1_0 : bool; + (** The guest supports the virtio devices that it does at the virtio-1.0 + protocol level. *) } (** Guest capabilities after conversion. eg. Was virtio found or installed? *) diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml index d49ecec03aeb..3f1114ad155d 100644 --- a/convert/convert_linux.ml +++ b/convert/convert_linux.ml @@ -155,6 +155,7 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = gcaps_machine = machine; gcaps_arch = Utils.kvm_arch inspect.i_arch; gcaps_acpi = acpi; + gcaps_virtio_1_0 = true; } in guestcaps diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 0ebffb156633..30e494ea02cb 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -259,6 +259,7 @@ let convert (g : G.guestfs) _ inspect _ static_ips = gcaps_machine = machine; gcaps_arch = Utils.kvm_arch inspect.i_arch; gcaps_acpi = true; + gcaps_virtio_1_0 = true; } in guestcaps diff --git a/lib/types.ml b/lib/types.ml index 52db1f9e05d0..50c41918b686 100644 --- a/lib/types.ml +++ b/lib/types.ml @@ -404,6 +404,7 @@ type guestcaps = { gcaps_machine : guestcaps_machine; gcaps_arch : string; gcaps_acpi : bool; + gcaps_virtio_1_0 : bool; } and guestcaps_block_type = Virtio_blk | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 @@ -432,6 +433,7 @@ let string_of_guestcaps gcaps = gcaps_machine = %s\n\ gcaps_arch = %s\n\ gcaps_acpi = %b\n\ + gcaps_virtio_1_0 = %b\n\ " (string_of_block_type gcaps.gcaps_block_bus) (string_of_net_type gcaps.gcaps_net_bus) @@ -442,6 +444,7 @@ let string_of_guestcaps gcaps = (string_of_machine gcaps.gcaps_machine) gcaps.gcaps_arch gcaps.gcaps_acpi + gcaps.gcaps_virtio_1_0 type target_buses = { target_virtio_blk_bus : target_bus_slot array; -- 2.19.1.3.g30247aa5d201

Let CNV / KubeVirt know about the "gcaps_virtio_1_0" field as well, so that it can make the same determination from "machine" and "gcaps_virtio_1_0" as virt-v2v does in the libvirt output (from an earlier patch in this series). Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1942325 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- Notes: This patch changes the JSON output as follows: output/create_json.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/output/create_json.ml b/output/create_json.ml index b48902b7d221..985e10a931c8 100644 --- a/output/create_json.ml +++ b/output/create_json.ml @@ -219,6 +219,7 @@ let create_json_metadata source inspect "isa-pvpanic", JSON.Bool guestcaps.gcaps_isa_pvpanic; "virtio-socket", JSON.Bool guestcaps.gcaps_virtio_socket; "acpi", JSON.Bool guestcaps.gcaps_acpi; + "virtio-1-0", JSON.Bool guestcaps.gcaps_virtio_1_0; ] in List.push_back doc ("guestcaps", JSON.Dict guestcaps_dict); -- 2.19.1.3.g30247aa5d201

Introduce the "osinfo_os.get_devices" OCaml method, for wrapping the libosinfo API osinfo_os_get_all_devices(). Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1942325 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/libosinfo.mli | 14 +++++ convert/libosinfo.ml | 14 +++++ convert/libosinfo-c.c | 66 ++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/convert/libosinfo.mli b/convert/libosinfo.mli index 0428ef911088..1ece7b41a310 100644 --- a/convert/libosinfo.mli +++ b/convert/libosinfo.mli @@ -29,11 +29,25 @@ type osinfo_device_driver = { files : string list; } +type osinfo_device = { + id : string; + vendor : string; + vendor_id : string; + product : string; + product_id : string; + name : string; + class_ : string; + bus_type : string; + subsystem : string; +} + class osinfo_os : osinfo_os_t -> object method get_id : unit -> string (** Return the ID. *) method get_device_drivers : unit -> osinfo_device_driver list (** Return the list of device drivers. *) + method get_devices : unit -> osinfo_device list + (** Return the list of devices. *) end (** Minimal OsinfoOs wrapper. *) diff --git a/convert/libosinfo.ml b/convert/libosinfo.ml index bd9ca126f3c0..78271be248ea 100644 --- a/convert/libosinfo.ml +++ b/convert/libosinfo.ml @@ -32,13 +32,27 @@ type osinfo_device_driver = { files : string list; } +type osinfo_device = { + id : string; + vendor : string; + vendor_id : string; + product : string; + product_id : string; + name : string; + class_ : string; + bus_type : string; + subsystem : string; +} + external osinfo_os_get_id : osinfo_os_t -> string = "v2v_osinfo_os_get_id" external osinfo_os_get_device_drivers : osinfo_os_t -> osinfo_device_driver list = "v2v_osinfo_os_get_device_drivers" +external osinfo_os_get_devices : osinfo_os_t -> osinfo_device list = "v2v_osinfo_os_get_all_devices" class osinfo_os h = object (self) method get_id () = osinfo_os_get_id h method get_device_drivers () = osinfo_os_get_device_drivers h + method get_devices () = osinfo_os_get_devices h end external osinfo_db_load : unit -> osinfo_db_t = "v2v_osinfo_db_load" diff --git a/convert/libosinfo-c.c b/convert/libosinfo-c.c index 09cf588d1c10..7a8e287aeb26 100644 --- a/convert/libosinfo-c.c +++ b/convert/libosinfo-c.c @@ -50,6 +50,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoFilter, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoLoader, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoOsList, g_object_unref) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoDeviceList, g_object_unref) #endif typedef OsinfoDb *OsinfoDb_t; @@ -255,3 +256,68 @@ v2v_osinfo_os_get_device_drivers (value osv) CAMLreturn (rv); } + +/* Collect OsinfoDevice properties from two levels: + * + * - The OSINFO_ENTITY_PROP_ID property, originating from the OsinfoEntity base + * class. This is a unique URI, identifying the device. + * + * - All currently known OSINFO_DEVICE_PROP_* properties, originating from the + * OsinfoDevice class. + * + * All of the above properties have string values. Thus, for uniformity, access + * all these properties by their names at the OsinfoEntity level (i.e., forego + * the class- and property-specific, dedicated property getter functions). + */ +static const char * const device_prop[] = { + OSINFO_ENTITY_PROP_ID, + OSINFO_DEVICE_PROP_VENDOR, + OSINFO_DEVICE_PROP_VENDOR_ID, + OSINFO_DEVICE_PROP_PRODUCT, + OSINFO_DEVICE_PROP_PRODUCT_ID, + OSINFO_DEVICE_PROP_NAME, + OSINFO_DEVICE_PROP_CLASS, + OSINFO_DEVICE_PROP_BUS_TYPE, + OSINFO_DEVICE_PROP_SUBSYSTEM, +}; +#define NUM_DEVICE_PROPS (sizeof device_prop / sizeof device_prop[0]) + +value +v2v_osinfo_os_get_all_devices (value osv) +{ + CAMLparam1 (osv); + CAMLlocal3 (retval, link, props); + g_autoptr (OsinfoDeviceList) dev_list = NULL; + OsinfoList *ent_list; + gint ent_nr; + + retval = Val_emptylist; + dev_list = osinfo_os_get_all_devices (OsinfoOs_t_val (osv), NULL); + ent_list = OSINFO_LIST (dev_list); + ent_nr = osinfo_list_get_length (ent_list); + + while (ent_nr > 0) { + OsinfoEntity *ent; + size_t prop_nr; + + --ent_nr; + ent = osinfo_list_get_nth (ent_list, ent_nr); + + props = caml_alloc (NUM_DEVICE_PROPS, 0); + for (prop_nr = 0; prop_nr < NUM_DEVICE_PROPS; ++prop_nr) { + const gchar *prop_val; + + prop_val = osinfo_entity_get_param_value (ent, device_prop[prop_nr]); + if (prop_val == NULL) + prop_val = ""; + Store_field (props, prop_nr, caml_copy_string (prop_val)); + } + + link = caml_alloc (2, 0); + Store_field (link, 0, props); + Store_field (link, 1, retval); + retval = link; + } + + CAMLreturn (retval); +} -- 2.19.1.3.g30247aa5d201

For debugging purposes, we'll want to print the list of devices returned by the previously introduced "osinfo_os#get_devices" method. Format the device list as a nice table. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1942325 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- Notes: Log examples will be shown later in this series, in the Notes section(s) of other patch(es). convert/libosinfo_utils.mli | 3 ++ convert/libosinfo_utils.ml | 35 ++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/convert/libosinfo_utils.mli b/convert/libosinfo_utils.mli index b3714d224ae4..5a703334d9f0 100644 --- a/convert/libosinfo_utils.mli +++ b/convert/libosinfo_utils.mli @@ -27,3 +27,6 @@ val get_os_by_short_id : string -> Libosinfo.osinfo_os val string_of_osinfo_device_driver : Libosinfo.osinfo_device_driver -> string (** Convert a [osinfo_device_driver] to a printable string for debugging. *) + +val string_of_osinfo_device_list : Libosinfo.osinfo_device list -> string +(** Convert an [osinfo_device] list to a printable string for debugging. *) diff --git a/convert/libosinfo_utils.ml b/convert/libosinfo_utils.ml index 1fc138cce321..d5eb082b458c 100644 --- a/convert/libosinfo_utils.ml +++ b/convert/libosinfo_utils.ml @@ -42,3 +42,38 @@ let string_of_osinfo_device_driver { Libosinfo.architecture; location; (if signed then "signed" else "unsigned") priority (String.concat " " files) + +let string_of_osinfo_device_list dev_list = + + (* Turn the fields of an "osinfo_device" record into a list. *) + let listify { Libosinfo.id; vendor; vendor_id; product; product_id; name; + class_; bus_type; subsystem } = + [ id; vendor; vendor_id; product; product_id; name; + class_; bus_type; subsystem ] + + (* Given a list of strings, and a list of previously known maximum widths, + * "increase" each width, if necessary, to the length of the corresponding + * string. + *) + and grow_widths = List.map2 (fun s -> max (String.length s)) + in + + (* Compute the maximum width for each field in "dev_list". *) + let max_widths = + List.fold_right grow_widths (List.map listify dev_list) + [ 0; 0; 0; 0; 0; 0; 0; 0; 0 ] + + (* Given a list of strings and a list of field widths, format "string1 | + * string2 | ... | stringN" such that each field is right-padded to the + * corresponding width. + *) + and columnate strings widths = + String.concat " | " (List.map2 (Printf.sprintf "%-*s") widths strings) + in + + (* Format "dev_list" as a table by (a) printing one "osinfo_device" record + * per line, and (b) right-padding each field of each "osinfo_device" record + * to the maximum width of that field. + *) + String.concat "\n" + (List.map (fun dev -> columnate (listify dev) max_widths) dev_list) -- 2.19.1.3.g30247aa5d201

On 01/06/22 16:02, Richard W.M. Jones wrote: It certainly occurred to me that we'd probably move this later to a more central utils module. I vaguely remember reviewing a patch from you that also used fixed maximum widths... I think it was about printing nbd block statuses or some such in a table format?... and I remember not really liking the fixed widths. Fixed widths almost always do the wrong thing: - they either waste space, or - fail to tabulate correctly. Case in point, before I set out writing this function, I ran: osinfo-query device just to get a taste of what I might expect. If you run that command now, you'll see that the command attempts to tabulate its output -- and that it fails at it *miserably*. The output is utter garbage, so much so that I couldn't read it, before I did: osinfo-query device | column -t -s \| which helped at least a little. So that's why I feel quite strongly about this -- and the resultant log snippets (which you can see in the Notes section of the last patch in the series) confirmed that determining the minimum sufficient field widths was a good idea. Thanks! This is actually the most functional-style part of the series, and I was super excited to write it. This is not the initial version: I remembered that you emphasized partial application in OCaml, and I kept trimming it (using partial application and existent List module APIs) until I could take nothing more away. Thanks! Laszlo

Determine the machine type and virtio-1.0 support from osinfo, for x86 guests. This connects the previous two parts of this series. Keep the original logic from commit ac39fa292c31 ("v2v: Set machine type explicitly for outputs which support it (RHBZ#1581428).", 2020-12-04) for non-x86 guests, and for the case when libosinfo does not recognize the guest OS. Update the "cdrom", "floppy", and "i-ova" test cases, which all use a (phony) Windows 7 image -- Windows 7 does not support virtio-1.0-only devices, according to libosinfo. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1942325 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- Notes: (1) The patch duplicates the following control structure between "convert_linux.ml" and "convert_windows.ml": arch: i386 or x86_64 grab OS device list from libosinfo success: debug-log device list determine machine type (q35 vs. i440fx) from device list determine virtio-1.0 support from device list not found: FALL BACK TO PRE-EXISTENT LOGIC assume "virtio-1.0: yes" arch: something else machine type: pick Virt assume "virtio-1.0: yes" All of this could be factored out to another helper function (the only difference between the Linux and Windows conversion is the "PRE-EXISTENT LOGIC"). However, I couldn't find a good spot for this. "lib/utils.mli" is too low-level, I think, whereas "convert/libosinfo_utils.mli" is not appropriate: the control structure above does not use libosinfo at all if the architecture differs from x86. (2) When converting a RHEL-5.11 guest, the log contains the following: Note that the device list does *not* contain the Q35 chipset, therefore we can expect the machine type to flip from Q35 to I440FX, rather than just the virtio model flipping from virtio to virtio-transitional. (2.1) Accordingly, the JSON output changes as follows: (2.2) The generated domain XML changes as follows: (2.3) The domain XML, completed by libvirtd, changes as follows: (2.4) The converted RHEL-5.11 guest actually boots. (3) When converting a RHEL-6.10 guest, the log contains: Refer to osinfo-db commit ae0add4d1b0f ("os: Add q35/ich9/e1000e to rhel6", 2018-10-11): https://gitlab.com/libosinfo/osinfo-db/-/commit/ae0add4d1b0f (3.1) The JSON output changes as follows (note the machine type in the context): (3.2) The generated domain XML changes like this (note the machine type in the context): (3.3) The domain XML, completed by libvirtd, changes as follows: Which can be summarized like below: - The model of all four virtio devices has changed from virtio to virtio-transitional (the fifth device, virtio-socket, is not supported at all). - The PCIe root ports providing bus numbers 2, 5, 6, 7, originally hosting the virtio devices, have been removed. The virtio devices have been moved to slots of "pcie-to-pci-bridge". - The (empty) PCIe root port providing bus number 8, has been removed. (This likely used to exist for hotplug purposes.) - "pcie-to-pci-bridge" now provides bus number 2, not 3. - The qemu-xhci device has been moved from the PCIe root port providing bus number 4 to a brand new port, providing bus number 3. The port providing bus number 4 is now empty (likely preserved for hotplug purposes). - The ich6 device has been kept on "pcie-to-pci-bridge", just relocated to a different slot. (3.4) The converted RHEL-6.10 guest actually boots. (4) When converting a RHEL-7.9 guest, the log contains: Note the presence of both "qemu-x86-q35" ("http://qemu.org/chipset/x86/q35") and "virtio1.0-net" ("http://pcisig.com/pci/1af4/1041"). (4.1) None of the JSON output, the generated libvirt XML, and the completed (imported by libvirtd) domain XML change. (4.2) The converted RHEL-7.9 guest continues booting. convert/convert_linux.ml | 51 ++++++++++++-------- convert/convert_windows.ml | 32 ++++++++---- tests/test-v2v-cdrom.expected | 2 +- tests/test-v2v-floppy.expected | 2 +- tests/test-v2v-i-ova.xml | 8 +-- 5 files changed, 60 insertions(+), 35 deletions(-) diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml index 3f1114ad155d..45ce069ad9bf 100644 --- a/convert/convert_linux.ml +++ b/convert/convert_linux.ml @@ -123,26 +123,39 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = SELinux_relabel.relabel g; - (* Pivot on the year 2007. Any Linux distro from earlier than - * 2007 should use i440fx, anything 2007 or newer should use q35. - * XXX Look up this information in libosinfo in future. - *) - let machine = - match inspect.i_arch, inspect.i_distro, inspect.i_major_version with - | ("i386"|"x86_64"), "fedora", _ -> Q35 - | ("i386"|"x86_64"), ("rhel"|"centos"|"scientificlinux"| - "redhat-based"|"oraclelinux"), major -> - if major <= 4 then I440FX else Q35 - | ("i386"|"x86_64"), ("sles"|"suse-based"|"opensuse"), major -> - if major < 10 then I440FX else Q35 - | ("i386"|"x86_64"), ("debian"|"ubuntu"|"linuxmint"| - "kalilinux"), major -> - if major < 4 then I440FX else Q35 + let machine, virtio_1_0 = + match inspect.i_arch with + | ("i386"|"x86_64") -> + (try + let os = Libosinfo_utils.get_os_by_short_id inspect.i_osinfo in + let devices = os#get_devices () in + debug "libosinfo devices for OS \"%s\":\n%s" inspect.i_osinfo + (Libosinfo_utils.string_of_osinfo_device_list devices); + let { Libosinfo_utils.q35; vio10 } = + Libosinfo_utils.os_support_of_osinfo_device_list devices in + (if q35 then Q35 else I440FX), vio10 + with + | Not_found -> + (* Pivot on the year 2007. Any Linux distro from earlier than 2007 + * should use i440fx, anything 2007 or newer should use q35. + *) + (match inspect.i_distro, inspect.i_major_version with + | "fedora", _ -> Q35 + | ("rhel"|"centos"|"scientificlinux"|"redhat-based"|"oraclelinux"), + major -> + if major <= 4 then I440FX else Q35 + | ("sles"|"suse-based"|"opensuse"), major -> + if major < 10 then I440FX else Q35 + | ("debian"|"ubuntu"|"linuxmint"|"kalilinux"), major -> + if major < 4 then I440FX else Q35 - (* reasonable default for all modern Linux kernels *) - | ("i386"|"x86_64"), _, _ -> Q35 + (* reasonable default for all modern Linux kernels *) + | _, _ -> Q35 + ), true + ) - | _ -> Virt in + | _ -> Virt, true + in (* Return guest capabilities from the convert () function. *) let guestcaps = { @@ -155,7 +168,7 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = gcaps_machine = machine; gcaps_arch = Utils.kvm_arch inspect.i_arch; gcaps_acpi = acpi; - gcaps_virtio_1_0 = true; + gcaps_virtio_1_0 = virtio_1_0; } in guestcaps diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 30e494ea02cb..1c2d17f26543 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -238,15 +238,27 @@ let convert (g : G.guestfs) _ inspect _ static_ips = warning (f_"this guest has Anti-Virus (AV) software and a new virtio block device driver was installed. In some circumstances, AV may prevent new drivers from working (resulting in a 7B boot error). If this happens, try disabling AV before doing the conversion."); ); - (* Pivot on the year 2007. Any Windows version from earlier than - * 2007 should use i440fx, anything 2007 or newer should use q35. - * Luckily this coincides almost exactly with the release of NT 6. - * XXX Look up this information in libosinfo in future. - *) - let machine = - match inspect.i_arch, inspect.i_major_version with - | ("i386"|"x86_64"), major -> if major < 6 then I440FX else Q35 - | _ -> Virt in + let machine, virtio_1_0 = + match inspect.i_arch with + | ("i386"|"x86_64") -> + (try + let os = Libosinfo_utils.get_os_by_short_id inspect.i_osinfo in + let devices = os#get_devices () in + debug "libosinfo devices for OS \"%s\":\n%s" inspect.i_osinfo + (Libosinfo_utils.string_of_osinfo_device_list devices); + let { Libosinfo_utils.q35; vio10 } = + Libosinfo_utils.os_support_of_osinfo_device_list devices in + (if q35 then Q35 else I440FX), vio10 + with + | Not_found -> + (* Pivot on the year 2007. Any Windows version from earlier than + * 2007 should use i440fx, anything 2007 or newer should use q35. + * Luckily this coincides almost exactly with the release of NT 6. + *) + (if inspect.i_major_version < 6 then I440FX else Q35), true + ) + | _ -> Virt, true + in (* Return guest capabilities from the convert () function. *) let guestcaps = { @@ -259,7 +271,7 @@ let convert (g : G.guestfs) _ inspect _ static_ips = gcaps_machine = machine; gcaps_arch = Utils.kvm_arch inspect.i_arch; gcaps_acpi = true; - gcaps_virtio_1_0 = true; + gcaps_virtio_1_0 = virtio_1_0; } in guestcaps diff --git a/tests/test-v2v-cdrom.expected b/tests/test-v2v-cdrom.expected index 17bd152d8e64..b950492969c8 100644 --- a/tests/test-v2v-cdrom.expected +++ b/tests/test-v2v-cdrom.expected @@ -1,4 +1,4 @@ - <disk type='file' device='disk'> + <disk type='file' device='disk' model='virtio-transitional'> <driver name='qemu' type='raw'/> <target dev='vda' bus='virtio'/> </disk> diff --git a/tests/test-v2v-floppy.expected b/tests/test-v2v-floppy.expected index a718c21f94dd..f4b679540c9d 100644 --- a/tests/test-v2v-floppy.expected +++ b/tests/test-v2v-floppy.expected @@ -1,4 +1,4 @@ - <disk type='file' device='disk'> + <disk type='file' device='disk' model='virtio-transitional'> <driver name='qemu' type='raw'/> <target dev='vda' bus='virtio'/> </disk> diff --git a/tests/test-v2v-i-ova.xml b/tests/test-v2v-i-ova.xml index 9f3c1974243f..2b6a8de0f432 100644 --- a/tests/test-v2v-i-ova.xml +++ b/tests/test-v2v-i-ova.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <disk type='file' device='disk'> + <disk type='file' device='disk' model='virtio-transitional'> <driver name='qemu' type='raw'/> <source file='TestOva-sda'/> <target dev='vda' bus='virtio'/> @@ -36,16 +36,16 @@ </disk> <interface type='bridge'> <source bridge='VM Network'/> - <model type='virtio'/> + <model type='virtio-transitional'/> </interface> <video> <model type='vga' vram='16384' heads='1'/> </video> <graphics type='vnc' autoport='yes' port='-1'/> - <rng model='virtio'> + <rng model='virtio-transitional'> <backend model='random'>/dev/urandom</backend> </rng> - <memballoon model='virtio'/> + <memballoon model='virtio-transitional'/> <viosock model='none'/> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> -- 2.19.1.3.g30247aa5d201