From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 30 Mar 2015 15:34:13 +0000 (+0200)
Subject: qemu: blockCopy: Pass adjusted bandwidth when called via blockRebase
X-Git-Tag: v1.2.13.1~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd270808482acbf091bdaf3520565f13a9a2b390;p=thirdparty%2Flibvirt.git

qemu: blockCopy: Pass adjusted bandwidth when called via blockRebase

The block copy API takes the speed in bytes/s rather than MiB/s that was
the prior approach in virDomainBlockRebase. We correctly converted the
speed to bytes/s in the old API but we still called the common helper
virDomainBlockCopyCommon with the unadjusted variable.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1207122
(cherry picked from commit 3c6a72d5376732efd8effb4a0a419211c0eb0659)
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f7228050f0..2097d9d76e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16334,7 +16334,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base,
     flags &= (VIR_DOMAIN_BLOCK_REBASE_SHALLOW |
               VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT);
     ret = qemuDomainBlockCopyCommon(vm, dom->conn, path, dest,
-                                    bandwidth, 0, 0, flags, true);
+                                    speed, 0, 0, flags, true);
     dest = NULL;
 
  cleanup: