Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1961107
This series advances in small steps, as follows:
- introduce the Standard_VGA data constructor (in addition to QXL,
Cirrus, ...);
- handle Standard_VGA (as a non-default option through the requested
guest caps) in the Linux and Windows guest conversions, and various
output modules;
- flip the default display choice from QXL to Standard_VGA if the
requested guest caps don't express a display preference;
- remove the QXL data constructor;
- clean up the test suite.
I'm posting the series as an RFC for two reasons:
- No actual guests have been converted for testing.
- I need further info (help) on the OVF, JSON and OpenStack output modes
because they are too tightly coupled with QXL, and/or I don't know how
to express "standard VGA" in them. (Watch out for the "Notes"
sections
in the relevant patches.)
However, the series should be complete enough to discuss the general
approach (and to convert some actual guests using the "QEMU cmdline" and
"libvirt XML" output formats).
(Side comment: today is a public holiday in Hungary, like in many other
countries. The fact that I'm posting this today does not imply that I
expect any feedback today (or soon after today). For personal reasons,
my work schedule has been very difficult to manage, and today has been a
rare day where I could actually sit down for a few hours
*uninterrupted*, and work on this. So the point of working on a holiday
was not to "be faster than others", but to make *any* progress worth
mentioning.)
Thanks,
Laszlo
Laszlo Ersek (10):
lib/types: introduce "Standard_VGA" constructor for
"guestcaps_video_type"
convert_linux: use "modesetting" X.org driver for Standard_VGA
convert/windows_virtio: restrict the warning with virtio-win.iso
absent
convert/windows_virtio: handle Standard_VGA in the requested guest
caps
output: handle Standard_VGA in the libvirt XML and QEMU cmdline
formats
convert_linux: flip default target display to Standard_VGA
convert/windows_virtio: flip default target display to Standard_VGA
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)
convert/convert_linux.ml | 7 ++-
convert/windows_virtio.ml | 48 +++++++-------------
lib/types.ml | 4 +-
lib/types.mli | 2 +-
output/create_json.ml | 2 +-
output/create_libvirt_xml.ml | 2 +-
output/openstack_image_properties.ml | 2 +-
output/output.ml | 5 +-
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.xml | 2 +-
tests/test-v2v-in-place.sh | 2 +-
tests/test-v2v-print-source.expected | 2 +-
tests/test-v2v-print-source.xml.in | 2 +-
tests/test-v2v-windows-conversion.sh | 2 +-
v2v/v2v_unit_tests.ml | 16 -------
32 files changed, 38 insertions(+), 98 deletions(-)
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf
delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf
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.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.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.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.sys
delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll
base-commit: 17e7cbffb9e5dad526dc8f63dc771aa15b306888
--
2.19.1.3.g30247aa5d201