]> xenbits.xensource.com Git - libvirt.git/commitdiff
BlockJob: Bandwidth parameter is in MB when using text monitor
authorAdam Litke <agl@us.ibm.com>
Wed, 31 Aug 2011 22:15:43 +0000 (17:15 -0500)
committerEric Blake <eblake@redhat.com>
Fri, 2 Sep 2011 02:11:50 +0000 (20:11 -0600)
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>
src/qemu/qemu_monitor_text.c

index f37c98cff9aab3601891a32181fff1fd9b889c65..854ee7f9f94fa539e56525fbc77eec84ed60653d 100644 (file)
@@ -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);