On 11/07/2016 04:56 PM, John Ferlan wrote:
> Add the capability to detect if the qemu binary can support the feature
> to use throttling.group.
>
> Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
> ---
> src/qemu/qemu_capabilities.c | 2 ++
> src/qemu/qemu_capabilities.h | 1 +
> tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 +
> tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 +
> tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 +
> tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 +
> tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 +
> 9 files changed, 10 insertions(+)
>
Peter's push of the query-qmp-schema and gluster.debug_level have
resulted in some more merges here (and an incorrect /* 240 */ on
gluster.debug_level) - I can fix that and post an update for this patch
if necessary...
John
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 747226c..7bdb324 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -350,6 +350,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
> "ivshmem-plain",
>
> "ivshmem-doorbell", /* 240 */
> + "drive-iotune-group",
> );
>
>
> @@ -2850,6 +2851,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 d104404..65b1d75 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -385,6 +385,7 @@ typedef enum {
>
> /* 240 */
> QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */
> + 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 3162758..e65ebe6 100644
> --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
> @@ -181,6 +181,7 @@
> <flag name='virtio-pci-disable-legacy'/>
> <flag name='machine-iommu'/>
> <flag name='virtio-vga'/>
> + <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 62d42c3..fc00271 100644
> --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
> @@ -186,6 +186,7 @@
> <flag name='virtio-pci-disable-legacy'/>
> <flag name='machine-iommu'/>
> <flag name='virtio-vga'/>
> + <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 4f1a58b..a7a1ea0 100644
> --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
> @@ -161,6 +161,7 @@
> <flag name='drive-iotune-max-length'/>
> <flag name='ivshmem-plain'/>
> <flag name='ivshmem-doorbell'/>
> + <flag name='drive-iotune-group'/>
> <version>2005094</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 0fa333a..2e4cb37 100644
> --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
> @@ -161,6 +161,7 @@
> <flag name='drive-iotune-max-length'/>
> <flag name='ivshmem-plain'/>
> <flag name='ivshmem-doorbell'/>
> + <flag name='drive-iotune-group'/>
> <version>2005094</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 7b3b61c..5a1b3f3 100644
> --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
> @@ -156,6 +156,7 @@
> <flag name='drive-iotune-max-length'/>
> <flag name='ivshmem-plain'/>
> <flag name='ivshmem-doorbell'/>
> + <flag name='drive-iotune-group'/>
> <version>2005094</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 74b5402..79e9690 100644
> --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
> @@ -195,6 +195,7 @@
> <flag name='drive-iotune-max-length'/>
> <flag name='ivshmem-plain'/>
> <flag name='ivshmem-doorbell'/>
> + <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 05dfcad..daf95c1 100644
> --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
> @@ -196,6 +196,7 @@
> <flag name='drive-iotune-max-length'/>
> <flag name='ivshmem-plain'/>
> <flag name='ivshmem-doorbell'/>
> + <flag name='drive-iotune-group'/>
> <version>2007000</version>
> <kvmVersion>0</kvmVersion>
> <package> (v2.7.0)</package>
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list