Deprecate QEMU_CAPS_DEVICE

We support qemu version 0.12.0+, which has it.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 656162cc14c66c431135722bd916bde11312718c..509b7ed524c4db6f72b4f95babf6b71568a22597 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1171,8 +1171,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
         if (strstr(help, "-chardev spiceport"))
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
     }
-    if (strstr(help, "-device"))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
     if (strstr(help, "-nodefconfig"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
     if (strstr(help, "-no-user-config"))
@@ -3331,8 +3329,7 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const c
 
     /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu
      * understands the 0.13.0+ notion of "-device driver,".  */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
-        strstr(help, "-device driver,?") &&
+    if (strstr(help, "-device driver,?") &&
         virQEMUCapsExtractDeviceStr(qemuCaps->binary,
                                     qemuCaps, runUid, runGid) < 0) {
         goto cleanup;
@@ -3374,7 +3371,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
@@ -4011,8 +4007,7 @@ virQEMUCapsSupportsChardev(const virDomainDef *def,
                            virQEMUCapsPtr qemuCaps,
                            virDomainChrDefPtr chr)
 {
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) ||
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV))
         return false;
 
     if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) {
@@ -4214,8 +4209,7 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
     VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
                              VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB,
                              VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI);
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC))
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC))
         VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
                                  VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI);
 
@@ -4230,9 +4224,7 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
                                  VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO);
     }
 
-    if (supportsPassthroughKVM &&
-        (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCIDEVICE) ||
-         virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))) {
+    if (supportsPassthroughKVM) {
         VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend,
                                  VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT,
                                  VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ed87b131b77d5361b69042da5095bf6e2ea1653b..1ee06461843b3c4d64a6c90bc9534ce2c8edba81 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -82,7 +82,7 @@ typedef enum {
 
     /* 25 */
     X_QEMU_CAPS_BALLOON, /* -balloon available */
-    QEMU_CAPS_DEVICE, /* Is the new -device arg available */
+    X_QEMU_CAPS_DEVICE, /* Is the -device arg available */
     QEMU_CAPS_SDL, /* Is the new -sdl arg available */
     QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
     QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
index 724291b9f92428fae0b3e09cc5340368dabf5866..bab364b480c68e3922595c8e08a766026b00a4b5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 4eb66af51674bae03e7b0ecb324fa33db40966b7..ce2e02f2387ae8a27302a4fb1fde4f07e8c7b188 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 72ea76f2eee67b895003db51939194b313e5638c..c8e60bbf240d8ee99bca00754f8b1f7ac24c762c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 1702208c3c416d7fbded307e2ca6b4453f1c976a..ee5ecd4dba1033a7d3683196294da3814688a5d6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 4e01f3f0f895fd5d0eb39680480bf5f98f9ec0f8..45155d6ca0f75dca396ad2131b29e14f605e979a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
index 2063f9ff57caf023ac5884b25eb89682785a6703..296f769332ce367759f7930cbac18c49113ec3cf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 954aa09c0578115b1b1e543096ba558c775d0d5f..65027a60e75e988651b411d21b019cdb676b5d4e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 1361d32eae93176f907a9e2e8603ca2413c128b1..b4b9a880120a490524b21bedaf1634c0d196ed32 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index a01e90ace60314343959717f409dd6c0e2cb9455..c08f7cc27a89fd5bcc4571559e82f101e0c7496a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index 5816993460832fc2b2107874adf0b5af94522294..8b68291aecb4e989bcd48c75349c953afb118c38 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index 83a78170113ebe7f94c15dc29b898acb96c8acc9..d65523ee285fca7699591c3c2e790b823aa99f7d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index caa2ce3106f1083580ea7300dee5803021bad6aa..771d20954387a9366ab8c1ff11b86b7e4831e5ed 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 41675f1f935a9255eb405b584ac2e838bd17e68b..9bdcb76cd757a9cce230c38ef10f1a7c1af21058 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -8,7 +8,6 @@
   <flag name='chardev'/>
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
-  <flag name='device'/>
   <flag name='sdl'/>
   <flag name='smp-topology'/>
   <flag name='netdev'/>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 31fe871c56784188767db1df15d6857e2b8925dc..d430fda0378659a4fae7e06e38d53065ddd31343 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -70,19 +70,17 @@ static int testHelpStrParsing(const void *data)
         virQEMUCapsSet(flags, QEMU_CAPS_MONITOR_JSON);
 # endif
 
-    if (virQEMUCapsGet(info->flags, QEMU_CAPS_DEVICE)) {
-        VIR_FREE(path);
-        VIR_FREE(help);
-        if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir,
-                        info->name) < 0)
-            goto cleanup;
-
-        if (virtTestLoadFile(path, &help) < 0)
-            goto cleanup;
-
-        if (virQEMUCapsParseDeviceStr(flags, help) < 0)
-            goto cleanup;
-    }
+    VIR_FREE(path);
+    VIR_FREE(help);
+    if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir,
+                    info->name) < 0)
+        goto cleanup;
+
+    if (virtTestLoadFile(path, &help) < 0)
+        goto cleanup;
+
+    if (virQEMUCapsParseDeviceStr(flags, help) < 0)
+        goto cleanup;
 
     got = virQEMUCapsFlagsString(flags);
     expected = virQEMUCapsFlagsString(info->flags);
@@ -156,7 +154,6 @@ mymain(void)
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
             QEMU_CAPS_NO_HPET,
@@ -177,7 +174,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
@@ -220,7 +216,6 @@ mymain(void)
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -247,7 +242,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
@@ -300,7 +294,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
@@ -351,7 +344,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
@@ -409,7 +401,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
@@ -483,7 +474,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index ea6dc361183a573860598558d9f09e2f69e4c3c9..689adc30aae5162d12529c7abd8797f6b57b3f4d 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -71,8 +71,6 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
     if (!(priv->qemuCaps = virQEMUCapsNew()))
         goto cleanup;
 
-    /* for attach & detach qemu must support -device */
-    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
     if (event)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 9194d8994fc1d2788ec3738e6925e762da1e26b0..41408406828415ef3f355440cb940d058dd521f7 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -299,7 +299,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
 
     virQEMUCapsSetList(extraFlags,
                        QEMU_CAPS_NO_ACPI,
-                       QEMU_CAPS_DEVICE,
                        QEMU_CAPS_LAST);
 
     if (STREQ(vm->def->os.machine, "pc") &&

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 89a4f7c001cd31abf8bfb9ff7406bcc871bfebd5..c85cd6072246c2c70e18e9e69557b85954bc4540 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -201,7 +201,6 @@ testInfoSet(struct testInfo *info,
         goto error;
 
     virQEMUCapsSetList(info->qemuCaps,
-                       QEMU_CAPS_DEVICE,
                        QEMU_CAPS_LAST);
 
     if (testQemuCapsSetGIC(info->qemuCaps, gic) < 0)