[RFC PATCH 27/43] qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to virQEMUCapsInitQMPBasicArch

Friday, 9 April 2021

Until we clean up and remove all capabilities which no longer make sense
to have separately, we should use virQEMUCapsInitQMPBasicArch to set the
defaults as it's used by qemuxml2argvtest when testing with fake
capabilities.

This allows us to prevent testing dead code paths with the fake
capability tests.

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt;
---
 src/qemu/qemu_capabilities.c                               | 7 +++++--
 tests/qemuxml2argvdata/audio-default-sdl.args              | 2 +-
 tests/qemuxml2argvdata/audio-default-spice.args            | 2 +-
 tests/qemuxml2argvdata/audio-default-vnc.args              | 2 +-
 tests/qemuxml2argvdata/channel-spicevmc.args               | 2 +-
 tests/qemuxml2argvdata/controller-order.args               | 2 +-
 tests/qemuxml2argvdata/graphics-egl-headless.args          | 2 +-
 tests/qemuxml2argvdata/graphics-sdl-fullscreen.args        | 2 +-
 tests/qemuxml2argvdata/graphics-sdl.args                   | 2 +-
 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args | 4 +---
 tests/qemuxml2argvdata/graphics-spice-agentmouse.args      | 2 +-
 tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args | 2 +-
 tests/qemuxml2argvdata/graphics-spice-auto-socket.args     | 2 +-
 tests/qemuxml2argvdata/graphics-spice-compression.args     | 4 +---
 tests/qemuxml2argvdata/graphics-spice-egl-headless.args    | 4 +---
 tests/qemuxml2argvdata/graphics-spice-no-args.args         | 2 +-
 tests/qemuxml2argvdata/graphics-spice-qxl-vga.args         | 4 +---
 tests/qemuxml2argvdata/graphics-spice-sasl.args            | 4 +---
 tests/qemuxml2argvdata/graphics-spice-socket.args          | 2 +-
 tests/qemuxml2argvdata/graphics-spice-timeout.args         | 2 +-
 tests/qemuxml2argvdata/graphics-spice-usb-redir.args       | 2 +-
 tests/qemuxml2argvdata/graphics-spice.args                 | 4 +---
 tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args   | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-auto-socket.args       | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-egl-headless.args      | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args    | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-none.args              | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-policy.args            | 2 +-
 .../graphics-vnc-remove-generated-socket.args              | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-sasl.args              | 2 +-
 .../qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args  | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-socket.args            | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-tls.args               | 2 +-
 tests/qemuxml2argvdata/graphics-vnc-websocket.args         | 2 +-
 tests/qemuxml2argvdata/graphics-vnc.args                   | 2 +-
 tests/qemuxml2argvdata/pci-autoadd-addr.args               | 2 +-
 tests/qemuxml2argvdata/pci-autoadd-idx.args                | 2 +-
 tests/qemuxml2argvdata/pci-autofill-addr.args              | 2 +-
 tests/qemuxml2argvdata/pci-bridge.args                     | 2 +-
 tests/qemuxml2argvdata/pci-many.args                       | 2 +-
 tests/qemuxml2argvdata/user-aliases.args                   | 2 +-
 tests/qemuxml2argvdata/video-vga-qxl-heads.args            | 5 +----
 42 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ea1c0a093f..36836cad3d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5041,11 +5041,15 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps,
  * virQEMUCapsInitQMPBasicArch:
  * @qemuCaps: QEMU capabilities
  *
- * Initialize @qemuCaps with basic architecture-dependent capabilities.
+ * Initialize @qemuCaps with basic always present and architecture-dependent
+ * capabilities.
  */
 void
 virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
 {
+    /* Following caps were asserted by a version check for pre 2.11 qemus */
+    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+
     switch (qemuCaps->arch) {
     case VIR_ARCH_I686:
     case VIR_ARCH_X86_64:
@@ -5122,7 +5126,6 @@ static void
 virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
 {
     /* Following caps were asserted by a version check for pre 2.11 qemus */
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args
b/tests/qemuxml2argvdata/audio-default-sdl.args
index b3b700e771..459b88c9de 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -27,4 +27,4 @@ SDL_AUDIODRIVER=esd \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -display sdl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args
b/tests/qemuxml2argvdata/audio-default-spice.args
index e6599bdb7b..ca81df013b 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=spice \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -spice port=0,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args
b/tests/qemuxml2argvdata/audio-default-vnc.args
index 7218aa2f99..28709a5c5d 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=alsa \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -vnc 127.0.0.1:0 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index 66b769d741..f0e5cf0333 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=spice \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 2a372acd9f..721c31691a 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -40,7 +40,7 @@ QEMU_AUDIO_DRV=spice \
 -device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
 -device usb-tablet,id=input0,bus=usb.0,port=1.2 \
 -spice
port=5901,tls-port=5902,addr=0.0.0.0,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=2 \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args
b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 343273fda0..15d6b05f06 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -25,4 +25,4 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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 \
 -display egl-headless \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index e35091025b..3cb348e818 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -28,4 +28,4 @@ DISPLAY=:0.1 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -full-screen \
 -display sdl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index 4cfa15550a..95e56ebf72 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -27,4 +27,4 @@ DISPLAY=:0.1 \
 -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 \
 -display sdl \
--vga std
+-device VGA,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index 1a6f5eabf3..0e561a8b75 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -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 \
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer=on,seamless-migration=on
\
--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=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index c4dd28fe47..03c8c58e6c 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=spice \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index c590bef6af..6f79764446 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index c590bef6af..6f79764446 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args
b/tests/qemuxml2argvdata/graphics-spice-compression.args
index a2fcbfdd68..7499b1b4b9 100644
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -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 \
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,seamless-migration=on
\
--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=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index 38a1b3aa23..66d6e491bd 100644
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -27,7 +27,5 @@ QEMU_AUDIO_DRV=spice \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=5903,addr=127.0.0.1,seamless-migration=on \
 -display egl-headless \
--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=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args
b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index 4d0d4fa10c..016d19d9eb 100644
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -24,5 +24,5 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice port=0,seamless-migration=on \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index d4892deb58..f9ba765198 100644
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -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 \
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,seamless-migration=on
\
--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=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args
b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index 2bec8485a9..306f292388 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -27,7 +27,5 @@ SASL_CONF_PATH=/root/.sasl2 \
 -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 \
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,sasl=on,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on
\
--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=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args
b/tests/qemuxml2argvdata/graphics-spice-socket.args
index a0fd778a58..71278eaab5 100644
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice unix,addr=/tmp/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args
b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index c23d02d05c..6ff61dfa88 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -33,6 +33,6 @@ QEMU_AUDIO_DRV=spice \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
 -spice port=5900,addr=127.0.0.1,seamless-migration=on \
--vga std \
+-device VGA,id=video0,bus=pci.0,addr=0x2 \
 -device AC97,id=sound0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index aae5910b07..cfe591e882 100644
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -27,7 +27,7 @@ QEMU_AUDIO_DRV=spice \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,seamless-migration=on
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -chardev socket,id=charredir0,host=localhost,port=4000 \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
 -chardev spicevmc,id=charredir1,name=usbredir \
diff --git a/tests/qemuxml2argvdata/graphics-spice.args
b/tests/qemuxml2argvdata/graphics-spice.args
index 4f5a08621f..7a9e55c59f 100644
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -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 \
 -spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,disable-agent-file-xfer=on,seamless-migration=on
\
--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=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index 2add4f4332..d11ac68cb1 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index 351a43351d..bbb464433d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index 2090f43609..5e9f417940 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc '[2001:1:2:3:4:5:1234:1234]:3' \
 -display egl-headless \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index dea9aad2c5..4b314c4269 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -vnc '[2001:1:2:3:4:5:1234:1234]:3' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args
b/tests/qemuxml2argvdata/graphics-vnc-none.args
index 87f9268c59..c75eb0ed52 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc none \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args
b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 8e20230050..dbdfb0074e 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -vnc '[::]:59630,share=allow-exclusive' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index 5fff7d85b1..b598886017 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -vnc 127.0.0.1:0 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index fd8caee0da..c566c92c00 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -27,4 +27,4 @@ SASL_CONF_PATH=/root/.sasl2 \
 -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 \
 -vnc 127.0.0.1:3,sasl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index e77d772af1..bede4e2e81 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc vnc=unix:/tmp/foo=bar.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index 16f931b32e..d99802b334 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc unix:/tmp/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index f1e0877a0d..e5b3f87ea0 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -25,4 +25,4 @@ SASL_CONF_PATH=/root/.sasl2 \
 -no-acpi \
 -usb \
 -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index 30c10e3490..c4b11106de 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc 127.0.0.1:0,websocket=5700 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/graphics-vnc.args
b/tests/qemuxml2argvdata/graphics-vnc.args
index dea9aad2c5..4b314c4269 100644
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -vnc '[2001:1:2:3:4:5:1234:1234]:3' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index c8abbc3501..65c0f4a15c 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index 6b2dc13d1c..46fc711e97 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -33,5 +33,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 5c281de780..f21fb7b7d0 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-virtio-disk0,readonly=on \
 -device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index 00a9996bfe..571e25cb4d 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -92,5 +92,5 @@ QEMU_AUDIO_DRV=none \
 -device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x6 \
 -vnc 127.0.0.1:0 \
 -k en-us \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 2512b2bdeb..972a5d43ff 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -81,5 +81,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182
\
 -drive
file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
 -device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183
\
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/user-aliases.args
b/tests/qemuxml2argvdata/user-aliases.args
index 1656e1df25..0afdab79f8 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -59,7 +59,7 @@ QEMU_AUDIO_DRV=none \
 -chardev
socket,id=charchannel0,path=/var/lib/libvirt/qemu/channel/target/gentoo.org.qemu.guest_agent.0,server=on,wait=off
\
 -device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0
\
 -vnc 127.0.0.1:0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 5fa7a53e52..1b0d2862b7 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -26,10 +26,7 @@ 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 \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=67108864 \
--global qxl-vga.max_outputs=1 \
+-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=33554432,max_outputs=3,bus=pci.0,addr=0x4 \
 -device
qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=7,bus=pci.0,addr=0x5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-- 
2.30.2


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[RFC PATCH 27/43] qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to virQEMUCapsInitQMPBasicArch