External/libvirt
1
0
Fork 0
Code

migration: convert speed from MiB/sec to bytes/sec in drive-mirror jobs

Browse Source 
Commit 08cc14f moved the conversion of MiB/s to B/s out of the
qemuMonitor APIs, but forgot to adjust the qemuMigrationDriveMirror
caller.

This patch will convert the migrate_speed value from MiB/s to its
mirror_speed equivalent in bytes/s.

Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Rudy Zhang 2016-04-01 10:16:53 +08:00 committed by Ján Tomko
parent 1d8351a94f
commit abf50874d6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_migration.c
View File

@ -2061,7 +2061,7 @@ qemuMigrationCancelDriveMirror(virQEMUDriverPtr driver,
* @vm: domain * @vm: domain
* @mig: migration cookie * @mig: migration cookie
* @host: where are we migrating to * @host: where are we migrating to
* @speed: how much should the copying be limited * @speed: bandwidth limit in MiB/s
* @migrate_flags: migrate monitor command flags * @migrate_flags: migrate monitor command flags
* *
* Run drive-mirror to feed NBD server running on dst and wait * Run drive-mirror to feed NBD server running on dst and wait
@ -2093,12 +2093,21 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver,
char *diskAlias = NULL; char *diskAlias = NULL;
char *nbd_dest = NULL; char *nbd_dest = NULL;
char *hoststr = NULL; char *hoststr = NULL;
unsigned long long mirror_speed = speed;
unsigned int mirror_flags = VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; unsigned int mirror_flags = VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT;
int rv; int rv;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name);
if (mirror_speed > LLONG_MAX >> 20) {
virReportError(VIR_ERR_OVERFLOW,
_("bandwidth must be less than %llu"),
LLONG_MAX >> 20);
goto cleanup;
}
mirror_speed <<= 20;
/* steal NBD port and thus prevent its propagation back to destination */ /* steal NBD port and thus prevent its propagation back to destination */
port = mig->nbd->port; port = mig->nbd->port;
mig->nbd->port = 0; mig->nbd->port = 0;
@ -2136,7 +2145,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver,
qemuBlockJobSyncBegin(disk); qemuBlockJobSyncBegin(disk);
/* Force "raw" format for NBD export */ /* Force "raw" format for NBD export */
mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest, mon_ret = qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest,
"raw", speed, 0, 0, mirror_flags); "raw", mirror_speed, 0, 0, mirror_flags);
VIR_FREE(diskAlias); VIR_FREE(diskAlias);
VIR_FREE(nbd_dest); VIR_FREE(nbd_dest);