[PATCH 26/38] qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Neal Gompa <ngompa13(a)gmail.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - 38 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0ac68197a3..5d6f553a07 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5043,7 +5043,6 @@ void virQEMUCapsInitQMPBasicArch(virQEMUCaps *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/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b3844e5ba6..0f1b1771fa 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -215,7 +215,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 120 */ QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */ - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */ + X_QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */ QEMU_CAPS_DEVICE_SCLPCONSOLE, /* -device sclpconsole */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ X_QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 5424d9e10d..8fb24b58f4 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -18,7 +18,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 53da19ab37..1e8b7b950f 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index f9d85560b6..bfbd1eccba 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -33,7 +33,6 @@ <flag name='reboot-timeout'/> <flag name='vnc'/> <flag name='VGA'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index adda67292e..f41264d274 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='reboot-timeout'/> <flag name='vnc'/> <flag name='VGA'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 348c4a0137..0de8c91d51 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -18,7 +18,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index fa6f941ef1..d8d9f84654 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 58c9bf5911..382067ba05 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='reboot-timeout'/> <flag name='vnc'/> <flag name='VGA'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 7cf5783af7..69a78550ac 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -11,7 +11,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index b5f6ce92cb..1f2fa2a141 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -11,7 +11,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index c9dc855dda..c00d3304ae 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -20,7 +20,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 7bc384aa47..d93e0eb17b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index fc47a03ec5..7416a4d589 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -33,7 +33,6 @@ <flag name='vnc'/> <flag name='VGA'/> <flag name='cirrus-vga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 162b7d01d3..1c95e13119 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 8f8d09eda0..d78db3a291 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -35,7 +35,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index cff1446571..b1773a0244 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -34,7 +34,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index fe66c3d8d2..3fc54c3855 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -38,7 +38,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 38cc9c4de3..797ce0d9c4 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -38,7 +38,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index 69b2106043..99e152a719 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -20,7 +20,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 8df0bf7192..0a8c2fcd55 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 13a7053940..6633170f4b 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index eeeb27797b..8b0decc29d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -35,7 +35,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index ddbd2c7433..d50f1fb3db 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -34,7 +34,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 5be3113789..727977a845 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -20,7 +20,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 436cfe952b..dd8ad40665 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 68ccaf6219..0064270519 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -35,7 +35,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 9388de40d0..97b3b72d9f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -34,7 +34,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 8df6622737..9ccd64d3bf 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -38,7 +38,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index b8a9ecf025..36f97a15d2 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 8f5d9a7565..3d0441e5f2 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -13,7 +13,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='nbd-server'/> <flag name='rng-random'/> <flag name='rng-egd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 86b87647a9..728c792a4d 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index d88f7c989a..7780b6757c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -35,7 +35,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index c8978d8e23..2dd00e77b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -34,7 +34,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 1a903d830e..f7011ab79b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -38,7 +38,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 675967ebbc..255cd99e26 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -20,7 +20,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 92c8688f31..80d9fa7598 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -45,7 +45,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 754319fa48..7428f90592 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -44,7 +44,6 @@ <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='vmware-svga'/> - <flag name='device-video-primary'/> <flag name='usb-serial'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> -- 2.30.2