qemu: capabilities: Retire QEMU_CAPS_DEVICE_VIDEO_PRIMARY

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

src/qemu/qemu_capabilities.c

@@ -5052,7 +5052,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);

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 */

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>