On 06/08/2025 15:21, Peter Krempa wrote:
On Mon, Aug 04, 2025 at 15:07:20 +0100, Mark Cave-Ayland wrote:
Signed-off-by: Mark Cave-Ayland <mark.caveayl...@nutanix.com>
---
[...]
diff --git a/tests/qemuxmlconfdata/video-virtio-edid-on.xml
b/tests/qemuxmlconfdata/video-virtio-edid-on.xml
new file mode 100644
index 0000000000..adf8580b17
--- /dev/null
+++ b/tests/qemuxmlconfdata/video-virtio-edid-on.xml
@@ -0,0 +1,36 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>df538144-b703-4b6d-860d-82ca8597d4c8</uuid>
+ <memory unit='KiB'>1048576</memory>
+ <currentMemory unit='KiB'>1048576</currentMemory>
+ <memoryBacking>
+ <source type='memfd'/>
+ </memoryBacking>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2' cache='none'/>
+ <source file='/var/lib/libvirt/images/QEMUGuest1'/>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+ </disk>
Please remove the disk from these to minimize unnecessary configs.
No problem, I can easily do that.
+ <controller type='ide' index='0'/>
+ <controller type='usb' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <video>
+ <model type='virtio' heads='1' primary='yes' edid='on'/>
+ </video>
+ <memballoon model='virtio'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 0d1804f101..1267671273 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -3041,6 +3041,18 @@ mymain(void)
DO_TEST_CAPS_LATEST("hwuuid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("hwuuid-smbios-uuid-match");
+ DO_TEST_CAPS_LATEST("video-bochs-edid-none");
+ DO_TEST_CAPS_LATEST("video-bochs-edid-on");
+ DO_TEST_CAPS_LATEST("video-bochs-edid-off");
+ DO_TEST_CAPS_LATEST("video-vga-edid-none");
+ DO_TEST_CAPS_LATEST("video-vga-edid-on");
+ DO_TEST_CAPS_LATEST("video-vga-edid-off");
+ DO_TEST_CAPS_LATEST("video-virtio-edid-none");
+ DO_TEST_CAPS_LATEST("video-virtio-edid-on");
+ DO_TEST_CAPS_LATEST("video-virtio-edid-off");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("video-qxl-edid-on-fail");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("video-qxl-edid-off-fail");
+
I'm not sure if the '-none' variants are needed as we ought to have
other tests testing the device itself. Since I don't have a too strong
opinion it's okay to leave them in.
We already do have a big block of test invocation for 'video-*' cases so
please order these with the other ones.
/* check that all input files were actually used here */
if (testConfXMLCheck(existingTestCases) < 0)
ret = -1;
That makes sense, I'll make the change in the next version.
With the above:
Reviewed-by: Peter Krempa <pkre...@redhat.com>
Thanks!
ATB,
Mark.
