From: Adam Litke <agl@us.ibm.com>
Date: Wed, 31 Aug 2011 22:15:43 +0000 (-0500)
Subject: BlockJob: Bandwidth parameter is in MB when using text monitor
X-Git-Tag: v0.9.5-rc1~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78d9325d1e215763914e0b535eb1a68aba426095;p=thirdparty%2Flibvirt.git

BlockJob: Bandwidth parameter is in MB when using text monitor

Due to an unfortunate precedent in qemu, the units for the bandwidth parameter
to block_job_set_speed are different between the text monitor and the qmp
monitor.  While the qmp monitor uses bytes/s, the text monitor expects MB/s.

Correct the units for the text interface.

Signed-off-by: Adam Litke <agl@us.ibm.com>
---

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index f37c98cff9..854ee7f9f9 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -3067,8 +3067,7 @@ int qemuMonitorTextBlockJob(qemuMonitorPtr mon,
         ret = virAsprintf(&cmd, "%s", cmd_name);
     } else if (mode == BLOCK_JOB_SPEED) {
         cmd_name = "block_job_set_speed";
-        ret = virAsprintf(&cmd, "%s %s %llu", cmd_name, device,
-                          bandwidth * 1024ULL * 1024ULL);
+        ret = virAsprintf(&cmd, "%s %s %luM", cmd_name, device, bandwidth);
     } else if (mode == BLOCK_JOB_PULL) {
         cmd_name = "block_stream";
         ret = virAsprintf(&cmd, "%s %s", cmd_name, device);