Re: [libvirt] [libvirt PATCH v2 33/44] Deprecate QEMU_CAPS_DRIVE_IOTUNE

[Andrea Bolognani]

On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 4e5d180c62..6a2a141069 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1659,17 +1659,13 @@ mymain(void)
>  DO_TEST("numad-auto-memory-vcpu-cpuset", NONE);
>  DO_TEST("numad-auto-memory-vcpu-no-cpuset-and-placement", NONE);
>  DO_TEST("numad-static-memory-auto-vcpu", NONE);
> -DO_TEST("blkdeviotune",
> -QEMU_CAPS_DRIVE_IOTUNE);

The next three tests cover all the options in this one, so just get
rid of it.

Reviewed-by: Andrea Bolognani 

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [libvirt PATCH v2 33/44] Deprecate QEMU_CAPS_DRIVE_IOTUNE

[Ján Tomko]

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_capabilities.c   |  1 -
 src/qemu/qemu_capabilities.h   |  2 +-
 src/qemu/qemu_command.c|  9 -
 src/qemu/qemu_driver.c | 14 --
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  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.aarch64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml|  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   |  1 -
 tests/qemuxml2argvtest.c   |  6 +-
 30 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b50652349a..6fb39a1027 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3630,7 +3630,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
 virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0e86f35420..79bab9359d 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -167,7 +167,7 @@ typedef enum {
 X_QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */
 
 /* 85 */
-QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */
+X_QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */
 QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */
 QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */
 QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ad2fed5b67..af7b895f8a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1132,15 +1132,6 @@ qemuCheckDiskConfigBlkdeviotune(virDomainDiskDefPtr disk,
 }
 
 if (qemuCaps) {
-/* block I/O throttling */
-if (qemuDiskConfigBlkdeviotuneHasBasic(disk) &&
-!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) {
-virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-   _("block I/O throttling not supported with this "
- "QEMU binary"));
-return -1;
-}
-
 /* block I/O throttling 1.7 */
 if (qemuDiskConfigBlkdeviotuneHasMax(disk) &&
 !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE_MAX)) {
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e3600d99de..06b5d1387d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18215,13 +18215,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
 supportMaxLengthOptions =
 virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH);
 
-if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) {
-virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-   _("block I/O throttling not supported with this "
- "QEMU binary"));
-goto endjob;
-}
-
 if (!supportMaxOptions &&
 (set_fields & (QEMU_BLOCK_IOTUNE_SET_BYTES_MAX |
QEMU_BLOCK_IOTUNE_SET_IOPS_MAX |
@@ -18400,13 +18393,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
 if (def) {
 /* If the VM is running, we can check if the current VM can use
  * optional parameters or not. */
-if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) {
-virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-