qemuBuildDeviceVideoCmd: Always assume support for 'max_outputs' property

Both the QXL video device and 'virtio' video device support
'max_outputs' in all qemu versions libvirt supports. This means we no
longer have to check the QEMU_CAPS_QXL_MAX_OUTPUTS and
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS capabilities.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bca867a492e00043dc1d78e33689b8770163e49d..9498b37f6bfd349ebdd2c5ec67c752936fac06e0 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4869,12 +4869,10 @@ qemuBuildDeviceVideoCmd(virCommand *cmd,
                 return -1;
         }
 
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) {
-            if (virJSONValueObjectAdd(&props,
-                                      "p:max_outputs", video->heads,
-                                      NULL) < 0)
-                return -1;
-        }
+        if (virJSONValueObjectAdd(&props,
+                                  "p:max_outputs", video->heads,
+                                  NULL) < 0)
+            return -1;
     } else if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
         g_autofree char *alias = qemuDomainGetVhostUserChrAlias(video->info.alias);
 
@@ -4886,8 +4884,7 @@ qemuBuildDeviceVideoCmd(virCommand *cmd,
     } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
         unsigned int heads = 0;
 
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS))
-            heads = video->heads;
+        heads = video->heads;
 
         if (virJSONValueObjectAdd(&props,
                                   "p:max_outputs", heads,

diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args
index 894e8cf3fb07a73d4bd5edda06ef6f744f2d81e1..7853fbed4d5859d4f5a136c9472986aec2f8becc 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -30,5 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
 -device ioh3420,port=16,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
 -vnc 127.0.0.1:0 \
--device virtio-gpu-pci,id=video0,bus=pci.2,addr=0x1 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.2,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index aeb1e59918e07db6d2c2b935dc7869f527ae9131..b87c645bf7107cb2a48cc5548da9350ed977af7b 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,multifunction=on,addr=0x1.0x1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:73:34:53,bootindex=1,bus=pci.1,addr=0x0 \
--device virtio-gpu-pci,id=video0,bus=pci.2,addr=0x0 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.2,addr=0x0 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
index 19c73b3a5f7679f50984ff39cd9bd8c171262452..3aec9cb96f107e37b25f13bdc5e9db7c0c1a7f70 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -30,5 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=26,chassis=40,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 3cbcc650f43944f9e293161da2bba587b980ea63..41fb7e4d0c9e7bd1bb38f0b45554f63617993a89 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -38,5 +38,5 @@ QEMU_AUDIO_DRV=none \
 -device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.2,addr=0x6 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 881f07aff17eaf7a63c86ed057da8932ba998f58..ed256a6473ff947ba281a0b73f02a4cd1455e748 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=none \
 -device x3130-upstream,id=pci.4,bus=pci.2,addr=0x0 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args
index 11be3a967b25e7bf1d49b00fb33356e597bbb746..400270b4b8180a2469f45f0a0c5f82ed8c976b76 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=none \
 -global q35-pcihost.pci-hole64-size=1048576K \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index f195b808dc3b159fe4eab98fdd647a786a78958e..101cc7fae804deef76ecb301c4355e0b1630ec27 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -55,7 +55,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-mouse-pci,id=input1,bus=pci.11,addr=0x0 \
 -device virtio-keyboard-pci,id=input2,bus=pci.12,addr=0x0 \
 -device virtio-tablet-pci,id=input3,bus=pci.13,addr=0x0 \
--device virtio-gpu-pci,id=video0,bus=pcie.0,addr=0x1 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.8,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.9,addr=0x0 \

diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index b851599c9f39d6585162a9237c1e62fe58972f47..52fdd3fa8c1c7c7430138ab7436f056d611cf69c 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -56,7 +56,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-mouse-pci,id=input1,bus=pci.13,addr=0x0 \
 -device virtio-keyboard-pci,id=input2,bus=pci.14,addr=0x0 \
 -device virtio-tablet-pci,id=input3,bus=pci.15,addr=0x0 \
--device virtio-gpu-pci,id=video0,bus=pcie.0,addr=0x1 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.10,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.11,addr=0x0 \

diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 72c1f2974b15768de973479d68184bdfe15b0f4f..69ee444043a6dfe87f1f0bd8b780695eb0f0bc17 100644 (file)
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -42,5 +42,5 @@ QEMU_AUDIO_DRV=none \
 -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-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 19c3bb00a5320f7939d0d3c5340550fe0265d421..ce64732a2c532bc7c2cf06f53fa269d6dbf53b8c 100644 (file)
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -42,5 +42,5 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index 97820436fb542257d9e61ba563ea9a9ec6854551..d6cdc55a6605c95100c124aa2f0f17c8fe54f2d5 100644 (file)
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -34,5 +34,5 @@ QEMU_AUDIO_DRV=none \
 -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-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index afaff442124d58e316cb9e84177f2dfdd6fae2e0..178f33e2aa5b2dd9d9bec47babf57f7ec88a4293 100644 (file)
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -47,7 +47,7 @@ QEMU_AUDIO_DRV=spice \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
 -spice port=5901,tls-port=5902,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=off,seamless-migration=on \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pcie.0,addr=0x1 \
 -device ich9-intel-hda,id=sound0,bus=pcie.0,addr=0x1b \
 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
 -chardev spicevmc,id=charredir0,name=usbredir \

diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
index 6f6e5998538e9819a6b74e7c741120fb0cad21bf..aaba2ede11555747d13a767e896f2b39b3034bfd 100644 (file)
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -56,7 +56,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-mouse-pci,id=input1,bus=pci.2,addr=0x9 \
 -device virtio-keyboard-pci,id=input2,bus=pci.2,addr=0xa \
 -device virtio-tablet-pci,id=input3,bus=pci.2,addr=0xb \
--device virtio-gpu-pci,id=video0,bus=pcie.0,addr=0x1 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x6 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.2,addr=0x7 \

diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index 3078a741ea299ecf0e382802fba33b1d59976a4e..9793c1144760de8d70eb655cd7447244e34b2e0e 100644 (file)
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=none \
 -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-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,max_outputs=1,bus=pcie.0,addr=0x1 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
index 7d4c2a0d372b2a1c75c6fe1ed20b42c87464367a..804e118540817e8418ca0b531010845996fcb7cb 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -32,6 +32,6 @@ QEMU_AUDIO_DRV=spice \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 931921734abfddc6ce6e84cb7b54ff2e270bfe23..baa15e44dfaa6d603ae9819c1b0057794451b415 100644 (file)
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -29,8 +29,8 @@ QEMU_AUDIO_DRV=none \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc 127.0.0.1:0 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \
--device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
--device qxl,id=video2,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x3 \
+-device qxl,id=video1,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x4 \
+-device qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index ad29990bc4fa625fe1606d45e78a22c34c9e1b16..e8931c07fcd109c01e05e2ce2d9e7cd80a24494c 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
index 7c4f654645ad443e5718ab9e47b2c8a3b455ae87..8a4729ac715ec2394ace9e20e513084f613c4904 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args
index bec1879e93abca95f92a622038a649d3c3d202d9..c66a08ee10c5a429fd4d0432b7041f512e4eb7e3 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8,xres=1280,yres=720,bus=pci.0,addr=0x2 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8,max_outputs=1,xres=1280,yres=720,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index a3ac6a11eb196f1d273e6a78f6dc1b06336af30d..7f3b5cc0d99b8f930246e47da3d26d17fba550fb 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \
--device qxl,id=video1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,max_outputs=1,bus=pci.0,addr=0x2 \
+-device qxl,id=video1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,max_outputs=1,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index e0de0fe3cdad93657200919b9b117876b94ae89e..4754289d6dcf9fe003c8bd1b61f8af6c5c1e058e 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
--device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x2 \
+-device qxl,id=video1,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index e23bdd8f36c2456de927de8d1a246990984b03a0..36a5b9bba8aa2f83929432816e7a34fe06c15d2a 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-gpu-pci,id=video0,bus=pci.0,addr=0x2 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index d254d270ff01ec0205eb3e0ae501cb2c99a0a480..c68bfc3064b1ef1eb085eb34ec9c8743f5f087b9 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -display sdl,gl=on \
--device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \
+-device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 5d7820b8de8829669af3ec3e3a17ed100afa2f6e..3e4f5da09f161d2c6843aa4dab06c13d5539f572 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -27,7 +27,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
--device virtio-gpu-pci,id=video0,bus=pci.0,addr=0x2 \
--device virtio-gpu-pci,id=video1,bus=pci.0,addr=0x4 \
+-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
+-device virtio-gpu-pci,id=video1,max_outputs=1,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index 770799c92c3bc673afe4d3d3f4ac65204870b7a6..2df35b484b391ee28e22ac93594cbe543d7db246 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=spice \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \
--device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \
+-device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index 3b18f9302f36ccd8be007a2cf926667e665b1bb6..512d625a28dd6ff682f900a361581b8167aed642 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \
+-device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on