Re: [libvirt] [PATCH 01/11] tests: fix some QXL capability combinations that doesn't make sense

s/doesn't/don't On 09/30/2016 12:02 PM, Pavel Hrdina wrote: > If one of QEMU_CAPS_DEVICE_QXL_VGA or QEMU_CAPS_DEVICE_QXL is set the > other one will always be set as well because both devices are tied > together in QEMU. And subsequent patches are about to make this a whole lot clearer, but in order to do so, we need to make sure the test output displays the combination of both properly especially with the capability QEMU_CAPS_DEVICE_VIDEO_PRIMARY > > The change of args files is caused by the presence of capability > QEMU_CAPS_DEVICE_VIDEO_PRIMARY which means it's safe to use > "-device qxl-vga" instead of "-vga qxl". IOW: The fallout for doing so when the *VIDEO_PRIMARY capability is set is that the command line generated changes.

[Text added to make sure I understand] I note it only seems to change the .args output for q35 and pcie. Even though graphics-spice* tests added the cap, their output didn't change. I assume because the *VIDEO_PRIMARY wasn't set, but figured I'd ask. I guess I'm just making sure it's nothing specific to q35/pcie...

I know the world is about to change some more ;-) Does anything need to change on formatdomain.html.in? I know this is a qemu specific change, but I'm thinking more in terms of describing how to use the type param for qga, qxl (primary/secondary)...

> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; > --- > .../qemuxml2argv-pcie-root-port.args | 5 ++- > .../qemuxml2argv-pcie-switch-downstream-port.args | 5 ++- > .../qemuxml2argv-pcie-switch-upstream-port.args | 5 ++- > .../qemuxml2argv-pcihole64-q35.args | 5 ++- > .../qemuxml2argv-q35-usb2-multi.args | 5 ++- > .../qemuxml2argv-q35-usb2-reorder.args | 5 ++- > tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args | 5 ++- > tests/qemuxml2argvdata/qemuxml2argv-q35.args | 5 ++- > tests/qemuxml2argvtest.c | 42 +++++++++++++++------- > tests/qemuxml2xmltest.c | 23 +++++++----- > 10 files changed, 59 insertions(+), 46 deletions(-) > ACK in principle... Now that I've read all the patches - I see that the absolute key in the VIDEO_PRIMARY capability - totally changes how the command line is built especially since we're not falling into that else condition which forces the specific (and I assume) sub-optimal video model usage. John > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args > index 35c2664..27d5164 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args > @@ -22,6 +22,5 @@ QEMU_AUDIO_DRV=none \ > -device ioh3420,port=0x1a,chassis=40,id=pci.4,bus=pcie.0,addr=0x3 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args > index 500b366..3b3e80d 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args > @@ -30,6 +30,5 @@ QEMU_AUDIO_DRV=none \ > -device xio3130-downstream,port=0x6,chassis=12,id=pci.12,bus=pci.4,addr=0x6 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args > index 24d5f37..93d16b8 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args > @@ -24,6 +24,5 @@ QEMU_AUDIO_DRV=none \ > -device x3130-upstream,id=pci.6,bus=pci.4,addr=0x0 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args > index ad28dde..ee9f699 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args > @@ -21,6 +21,5 @@ QEMU_AUDIO_DRV=none \ > -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args > index d465c69..01d296d 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args > @@ -35,6 +35,5 @@ addr=0x1 \ > -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args > index 87d2ce7..1548845 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args > @@ -35,6 +35,5 @@ multifunction=on,addr=0x1a \ > addr=0x1 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args > index 1d44e7a..733a4dc 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args > @@ -25,6 +25,5 @@ addr=0x1d \ > -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args > index 1d44e7a..733a4dc 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args > +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args > @@ -25,6 +25,5 @@ addr=0x1d \ > -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \ > -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \ > -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ > --vga qxl \ > --global qxl-vga.ram_size=67108864 \ > --global qxl-vga.vram_size=33554432 > +-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,\ > +addr=0x1 > diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c > index 4b9ecb8..dbb86c9 100644 > --- a/tests/qemuxml2argvtest.c > +++ b/tests/qemuxml2argvtest.c > @@ -997,6 +997,7 @@ mymain(void) > DO_TEST("graphics-spice", > QEMU_CAPS_VGA_QXL, > QEMU_CAPS_SPICE, > + QEMU_CAPS_DEVICE_QXL_VGA, > QEMU_CAPS_DEVICE_QXL, > QEMU_CAPS_SPICE_FILE_XFER_DISABLE); > DO_TEST("graphics-spice-no-args", > @@ -1006,6 +1007,7 @@ mymain(void) > DO_TEST("graphics-spice-sasl", > QEMU_CAPS_VGA_QXL, > QEMU_CAPS_SPICE, > + QEMU_CAPS_DEVICE_QXL_VGA, > QEMU_CAPS_DEVICE_QXL); > VIR_FREE(driver.config->spiceSASLdir); > driver.config->spiceSASL = 0; > @@ -1017,12 +1019,14 @@ mymain(void) > DO_TEST("graphics-spice-compression", > QEMU_CAPS_VGA_QXL, > QEMU_CAPS_SPICE, > + QEMU_CAPS_DEVICE_QXL_VGA, > QEMU_CAPS_DEVICE_QXL); > DO_TEST("graphics-spice-timeout", > QEMU_CAPS_KVM, > QEMU_CAPS_VGA_QXL, > QEMU_CAPS_SPICE, > - QEMU_CAPS_DEVICE_QXL_VGA); > + QEMU_CAPS_DEVICE_QXL_VGA, > + QEMU_CAPS_DEVICE_QXL); > DO_TEST("graphics-spice-qxl-vga", > QEMU_CAPS_VGA_QXL, > QEMU_CAPS_SPICE, > @@ -1576,10 +1580,12 @@ mymain(void) > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_VGAMEM); > DO_TEST("video-qxl-nodevice", QEMU_CAPS_VGA_QXL); > DO_TEST("video-qxl-device", QEMU_CAPS_DEVICE_QXL_VGA, > + QEMU_CAPS_DEVICE_QXL, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY); > DO_TEST("video-qxl-device-vgamem", > - QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_QXL_VGA_VGAMEM); > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL, > + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > + QEMU_CAPS_QXL_VGA_VGAMEM, QEMU_CAPS_QXL_VGAMEM); > DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA_QXL); > DO_TEST("video-qxl-sec-device", QEMU_CAPS_DEVICE_QXL_VGA, > QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); > @@ -1682,7 +1688,8 @@ mymain(void) > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > @@ -1706,28 +1713,32 @@ mymain(void) > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("q35-usb2-multi", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("q35-usb2-reorder", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("pcie-root-port", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_DEVICE_IOH3420, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("autoindex", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > @@ -1744,7 +1755,8 @@ mymain(void) > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST_PARSE_ERROR("440fx-wrong-root", NONE); > > DO_TEST_PARSE_ERROR("pcie-root-port-too-many", > @@ -1753,7 +1765,8 @@ mymain(void) > QEMU_CAPS_DEVICE_IOH3420, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > > DO_TEST("pcie-switch-upstream-port", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > @@ -1762,7 +1775,8 @@ mymain(void) > QEMU_CAPS_DEVICE_X3130_UPSTREAM, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("pcie-switch-downstream-port", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > @@ -1771,7 +1785,8 @@ mymain(void) > QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > > DO_TEST("pci-expander-bus", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > @@ -1856,7 +1871,8 @@ mymain(void) > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL, > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL, > QEMU_CAPS_Q35_PCI_HOLE64_SIZE); > > DO_TEST("arm-vexpressa9-nodevs", > diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c > index fb05c85..e2c4d0e 100644 > --- a/tests/qemuxml2xmltest.c > +++ b/tests/qemuxml2xmltest.c > @@ -675,45 +675,49 @@ mymain(void) > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, > QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("q35-usb2", > QEMU_CAPS_DEVICE_PCI_BRIDGE, > QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("q35-usb2-multi", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, > QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("q35-usb2-reorder", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, > QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > > DO_TEST("pcie-root", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL, > - QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("pcie-root-port", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL, > - QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("pcie-switch-upstream-port", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL, > - QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("pcie-switch-downstream-port", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, > QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL, > - QEMU_CAPS_DEVICE_QXL); > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL); > DO_TEST("pci-expander-bus", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PXB); > DO_TEST("pcie-expander-bus", > @@ -782,7 +786,8 @@ mymain(void) > DO_TEST("pcihole64-q35", > QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, > - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL, > + QEMU_CAPS_VGA_QXL, > + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL, > QEMU_CAPS_Q35_PCI_HOLE64_SIZE); > > DO_TEST("panic", NONE); > -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list