caps: Add new capability for the iotune group name

Add the capability to detect if the qemu binary can support the feature
to use throttling.group.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 45ab5bbb68014c3a1894610a16fcc3d3f3844b8b..df417f2f0d6d6a18fa199bb31291b771a3a2b366 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -353,6 +353,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "query-qmp-schema",
               "gluster.debug_level",
               "vhost-scsi",
+              "drive-iotune-group",
     );
 
 
@@ -2923,6 +2924,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "name", "guest", QEMU_CAPS_NAME_GUEST },
     { "spice", "unix", QEMU_CAPS_SPICE_UNIX },
     { "drive", "throttling.bps-total-max-length", QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH },
+    { "drive", "throttling.group", QEMU_CAPS_DRIVE_IOTUNE_GROUP },
 };
 
 static int

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ee4bbb329f76bdfbc898f80cf819c11947220ec7..cbab8798334aa24f2efa6531b962151a533c2030 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -388,6 +388,7 @@ typedef enum {
     QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */
     QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
     QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */
+    QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=<name> */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 7795d687fc8ff6eecb42b5e4764c594db8809c4c..9248a06346a31caf2f35b981aaa67fffa15d9104 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -182,6 +182,7 @@
   <flag name='machine-iommu'/>
   <flag name='virtio-vga'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 98c88d2eef166935995e5dc45db4526b8908efbc..96e62d3e59a2ceb320b4ab297ba14f2406c29907 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -188,6 +188,7 @@
   <flag name='virtio-vga'/>
   <flag name='query-qmp-schema'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index 4a2786d76c4c50a626ada63e06ef72a4f695a84e..0aed651e77e4445dfc8885b9a7ed734e5613a18b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -163,6 +163,7 @@
   <flag name='ivshmem-doorbell'/>
   <flag name='query-qmp-schema'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index ceeb293fe3c292c9c0dea0b6999576837b7028fd..1041a12c12971516ca175cc1dcabb79949e59736 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -163,6 +163,7 @@
   <flag name='ivshmem-doorbell'/>
   <flag name='query-qmp-schema'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index c02b2563f7254ad2d19c4b84c5238f20e82f1df4..92e27810f2daa613ade7c11cad184b2f2b4a348b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -158,6 +158,7 @@
   <flag name='ivshmem-doorbell'/>
   <flag name='query-qmp-schema'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 71ffa0083c379001aabc65b7a10a0ad40b97ea0f..faddd5065aeec9fef98ad63a58c469b7efc756a7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -197,6 +197,7 @@
   <flag name='ivshmem-doorbell'/>
   <flag name='query-qmp-schema'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index dccb7e297b65242fa88872a150693ef1fdecd018..c789f0eaa76cf3a5d533fd56fdbe7b2cd660ddd9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -199,6 +199,7 @@
   <flag name='query-qmp-schema'/>
   <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.7.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index e487c40509458f14740d68acac203854c6408bd8..f5e467c14c8d2aaae7db26de7c7f29e2350b7984 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -196,6 +196,7 @@
   <flag name='ivshmem-doorbell'/>
   <flag name='query-qmp-schema'/>
   <flag name='vhost-scsi'/>
+  <flag name='drive-iotune-group'/>
   <version>2007091</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.8.0-rc1-dirty)</package>