External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Make tunnelled migration honour resource restriction

Browse Source 
The doTunnelMigrate method forgot to set the bandwidth
resource restriction

* src/qemu/qemu_migration.c: Set resource restriction
This commit is contained in:
Daniel P. Berrange 2011-04-20 17:56:35 +01:00
parent 792a5a6159
commit dba5a60462
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_migration.c
View File

@ -1299,7 +1299,6 @@ static int doTunnelSendAll(virStreamPtr st,
return -1; return -1;
} }
/* XXX should honour the 'resource' parameter here */
for (;;) { for (;;) {
nbytes = saferead(sock, buffer, nbytes); nbytes = saferead(sock, buffer, nbytes);
if (nbytes < 0) { if (nbytes < 0) {
@ -1339,7 +1338,7 @@ static int doTunnelMigrate(struct qemud_driver *driver,
char **cookieout, char **cookieout,
int *cookieoutlen, int *cookieoutlen,
unsigned long flags, unsigned long flags,
unsigned long resource ATTRIBUTE_UNUSED) unsigned long resource)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int client_sock = -1; int client_sock = -1;
@ -1421,6 +1420,11 @@ static int doTunnelMigrate(struct qemud_driver *driver,
/* 3. start migration on source */ /* 3. start migration on source */
qemuDomainObjEnterMonitorWithDriver(driver, vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (resource > 0 &&
qemuMonitorSetMigrationSpeed(priv->mon, resource) < 0) {
qemuDomainObjExitMonitorWithDriver(driver, vm);
goto cleanup;
}
if (flags & VIR_MIGRATE_NON_SHARED_DISK) if (flags & VIR_MIGRATE_NON_SHARED_DISK)
background_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_DISK; background_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_DISK;