qemu: deprecate QEMU_CAPS_VGA_NONE

Last use was removed by commit 0586cf98 deprecating
QEMU_CAPS_DEVICE.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);

src/qemu/qemu_capabilities.h

@@ -113,7 +113,7 @@ typedef enum {
     /* 45 */
     X_QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */
     QEMU_CAPS_SPICE, /* Is -spice avail */
-    QEMU_CAPS_VGA_NONE, /* The 'none' arg for '-vga' */
+    X_QEMU_CAPS_VGA_NONE, /* The 'none' arg for '-vga' */
     X_QEMU_CAPS_MIGRATE_QEMU_FD, /* -incoming fd:n */
     QEMU_CAPS_BOOTINDEX, /* -device bootindex property */
 

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='enable-kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -8,7 +8,6 @@
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
   <flag name='spice'/>
-  <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
   <flag name='drive-aio'/>

tests/qemuxml2argvtest.c

@@ -1120,8 +1120,7 @@ mymain(void)
     DO_TEST("nographics", NONE);
     DO_TEST("nographics-display",
             QEMU_CAPS_DISPLAY);
-    DO_TEST("nographics-vga",
+    DO_TEST("nographics-vga", NONE);
-            QEMU_CAPS_VGA_NONE);
     DO_TEST("graphics-spice",
             QEMU_CAPS_SPICE,
             QEMU_CAPS_DEVICE_QXL,