qemu: caps: blacklist QEMU_CAPS_CHARDEV

Every qemu version we support has QEMU_CAPS_CHARDEV, so stop
explicitly tracking it and blacklist it like we've done for many
other feature flags.
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
Signed-off-by: NCole Robinson <crobinso@redhat.com>

src/qemu/qemu_capabilities.c

@@ -1275,13 +1275,10 @@ virQEMUCapsComputeCmdFlags(const char *help,
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
     if (strstr(help, "-mem-path"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH);
-    if (strstr(help, "-chardev")) {
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
-        if (strstr(help, "-chardev spicevmc"))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);
-        if (strstr(help, "-chardev spiceport"))
-            virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
-    }
+    if (strstr(help, "-chardev spicevmc"))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);
+    if (strstr(help, "-chardev spiceport"))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
     if (strstr(help, "-nodefconfig"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
     if (strstr(help, "-no-user-config"))
@@ -4467,7 +4464,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
@@ -5555,12 +5551,9 @@ virQEMUCapsCacheFree(virQEMUCapsCachePtr cache)
 
 bool
 virQEMUCapsSupportsChardev(const virDomainDef *def,
-                           virQEMUCapsPtr qemuCaps,
+                           virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
                            virDomainChrDefPtr chr)
 {
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV))
-        return false;
-
     if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) {
         if (!qemuDomainIsPSeries(def))
             return false;

src/qemu/qemu_capabilities.h

@@ -77,7 +77,7 @@ typedef enum {
     /* 20 */
     X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */
     X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */
-    QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
+    X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
     QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */
     QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
 

tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml

@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
-  <flag name='chardev'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>

tests/qemuhelptest.c

@@ -159,7 +159,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_SDL,
-            QEMU_CAPS_CHARDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_NO_HPET,
             QEMU_CAPS_BOOT_MENU,
@@ -192,7 +191,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
-            QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_RTC,
             QEMU_CAPS_NO_HPET,
@@ -230,7 +228,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
-            QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
             QEMU_CAPS_NETDEV,
@@ -277,7 +274,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
-            QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
             QEMU_CAPS_NETDEV,
@@ -348,7 +344,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_SERIAL,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
-            QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
             QEMU_CAPS_NETDEV,

tests/qemuxml2xmltest.c

@@ -1065,7 +1065,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX);
     DO_TEST("aarch64-pci-serial",
             QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_CHARDEV,
             QEMU_CAPS_DEVICE_PCI_SERIAL,
             QEMU_CAPS_CHARDEV_LOGFILE,
             QEMU_CAPS_OBJECT_GPEX,