]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Fix off-by-one error in block I/O throttle messages
authorMartin Kletzander <mkletzan@redhat.com>
Mon, 25 Apr 2016 09:54:56 +0000 (11:54 +0200)
committerCole Robinson <crobinso@redhat.com>
Wed, 4 May 2016 22:49:35 +0000 (18:49 -0400)
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)

src/qemu/qemu_command.c
src/qemu/qemu_driver.c

index 78e0cabc3e07df0b736a8864997597e8b90091cc..8819cd7a8d1bc3abe8ba4917d677fc3bd15cfaa9 100644 (file)
@@ -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;
     }
 
index 1290f3f5c13407c8c9396820610bba50252abbac..31c93a8c19129bba53f40fd5fd557caf0ada13e9 100644 (file)
@@ -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;
         }