From: Martin Kletzander <mkletzan@redhat.com>
Date: Mon, 25 Apr 2016 09:54:56 +0000 (+0200)
Subject: qemu: Fix off-by-one error in block I/O throttle messages
X-Git-Tag: v1.3.3.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20ae6d725b62f9dfb47b2ddcecf07ce7aca076e8;p=thirdparty%2Flibvirt.git

qemu: Fix off-by-one error in block I/O throttle messages

QEMU_BLOCK_IOTUNE_MAX is the maximum inclusively, so let's modify the
message so it makes sense.

https://bugzilla.redhat.com/show_bug.cgi?id=1329041

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
(cherry picked from commit 72c313bce9043a181cc951871f38a37f6cbeb785)
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 78e0cabc3e..8819cd7a8d 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1415,7 +1415,7 @@ qemuBuildDriveStr(virConnectPtr conn,
         disk->blkdeviotune.size_iops_sec > QEMU_BLOCK_IOTUNE_MAX) {
         virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
                       _("block I/O throttle limit must "
-                        "be less than %llu using QEMU"), QEMU_BLOCK_IOTUNE_MAX);
+                        "be no more than %llu using QEMU"), QEMU_BLOCK_IOTUNE_MAX);
         goto error;
     }
 
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1290f3f5c1..31c93a8c19 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17509,7 +17509,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
         if (param->value.ul > QEMU_BLOCK_IOTUNE_MAX) {
             virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
                            _("block I/O throttle limit value must"
-                             " be less than %llu"), QEMU_BLOCK_IOTUNE_MAX);
+                             " be no more than %llu"), QEMU_BLOCK_IOTUNE_MAX);
             goto endjob;
         }