On 12/02/21 10:46, Laszlo Ersek wrote: > Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107 > v1: > https://listman.redhat.com/archives/libguestfs/2021-November/msg00150.html > > Please see the v2 changes (relative to the v1 posting) in the Notes > sections of the individual patches. > > The v2v QE team at Red Hat has helped a lot with testing (see again the > per-patch v2 notes); the only part that still needs good test results is > the OVF output.
Pushed as commit range ddc96fc5aae4..dbbdd4c20a6a (per prior discussion with Rich). Thanks! Laszlo > > Cc: Arik Hadas <[email protected]> > Cc: Fabian Deutsch <[email protected]> > Cc: Gerd Hoffmann <[email protected]> > Cc: Kashyap Chamarthy <[email protected]> > Cc: Liran Rotenberg <[email protected]> > > Thanks! > Laszlo > > Laszlo Ersek (16): > lib/types: introduce "Standard_VGA" constructor for > "guestcaps_video_type" > output: handle Standard_VGA in the libvirt XML and QEMU cmdline > formats > output: handle Standard_VGA in the OpenStack format > output: handle Standard_VGA in the JSON format > convert_linux: flip target display to Standard_VGA > convert/windows_virtio: flip target display to Standard_VGA > lib/create_ovf: fix "qxl_resourcetype" misnomer > lib/create_ovf: place a standard VGA video device in the OVF xml > lib/types: remove "QXL" constructor for "guestcaps_video_type" > tests: remove the fake Windows guest drivers for the QXL device > tests: remove the remaining QXL references (for completeness) > lib/types: remove "Cirrus" constructor for "guestcaps_video_type" > convert/windows_virtio: fix documentation of "install_drivers" return > type > lib/types: remove "guestcaps_video_type" > lib/types: replace "source_video" type with plain "string" > lib/types: remove the "source.s_video" field > > convert/convert_linux.ml | 3 +-- > convert/convert_windows.ml | 2 -- > convert/windows_virtio.ml | 18 > ++------------- > convert/windows_virtio.mli | 11 +++++----- > input/input.ml | 2 -- > input/parse_domain_from_vmx.ml | 8 ------- > input/parse_libvirt_xml.ml | 16 > -------------- > lib/create_ovf.ml | 22 > +++++++++++-------- > lib/types.ml | 23 > -------------------- > lib/types.mli | 18 > ++++----------- > output/create_json.ml | 5 +---- > output/create_libvirt_xml.ml | 4 +--- > output/openstack_image_properties.ml | 5 +---- > output/output.ml | 3 +-- > test-data/fake-virtio-win/Makefile.am | 16 > -------------- > test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.cat | 1 - > test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf | 2 -- > test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.sys | 1 - > test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxldd.dll | 1 - > test-data/fake-virtio-win/drivers/amd64/Win7/qxl.cat | 1 - > test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf | 2 -- > test-data/fake-virtio-win/drivers/amd64/Win7/qxl.sys | 1 - > test-data/fake-virtio-win/drivers/amd64/Win7/qxldd.dll | 1 - > test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat | 1 - > test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf | 2 -- > test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys | 1 - > test-data/fake-virtio-win/drivers/i386/Win7/qxldd.dll | 1 - > test-data/fake-virtio-win/drivers/i386/WinXP/qxl.cat | 1 - > test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf | 2 -- > test-data/fake-virtio-win/drivers/i386/WinXP/qxl.sys | 1 - > test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll | 1 - > test-data/phony-guests/guests.xml.in | 2 +- > tests/test-v2v-i-ova-formats.expected | 1 - > tests/test-v2v-i-ova-gz.expected | 1 - > tests/test-v2v-i-ova-snapshots.expected | 1 - > tests/test-v2v-i-ova-snapshots.expected2 | 1 - > tests/test-v2v-i-ova-subfolders.expected | 1 - > tests/test-v2v-i-ova-subfolders.expected2 | 1 - > tests/test-v2v-i-ova-tar.expected | 1 - > tests/test-v2v-i-ova-tar.expected2 | 1 - > tests/test-v2v-i-ova-two-disks.expected | 1 - > tests/test-v2v-i-ova-two-disks.expected2 | 1 - > tests/test-v2v-i-ova.xml | 2 +- > tests/test-v2v-i-vmx-1.expected | 1 - > tests/test-v2v-i-vmx-2.expected | 1 - > tests/test-v2v-i-vmx-3.expected | 1 - > tests/test-v2v-i-vmx-4.expected | 1 - > tests/test-v2v-i-vmx-5.expected | 1 - > tests/test-v2v-in-place.sh | 2 +- > tests/test-v2v-o-rhv.ovf.expected | 4 ++-- > tests/test-v2v-o-vdsm-options.ovf.expected | 4 ++-- > tests/test-v2v-print-source.expected | 1 - > tests/test-v2v-print-source.xml.in | 2 +- > tests/test-v2v-windows-conversion.sh | 2 +- > v2v/v2v_unit_tests.ml | 16 > -------------- > 55 files changed, 38 insertions(+), 188 deletions(-) > delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.cat > delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf > delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.sys > delete mode 100644 > test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxldd.dll > delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxl.cat > delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf > delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxl.sys > delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxldd.dll > delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat > delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf > delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys > delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxldd.dll > delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxl.cat > delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf > delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxl.sys > delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll > > > base-commit: ddc96fc5aae4c0249f7485c728ccb102e8301424 > _______________________________________________ Libguestfs mailing list [email protected] https://listman.redhat.com/mailman/listinfo/libguestfs
