External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 22:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_migration: Stop NBD server at Finish phase

Browse Source 
At the end of migration, it is important to stop NBD
server and thus release all allocated resources.
This commit is contained in:
Michal Privoznik 2012-11-27 16:34:24 +01:00
parent 7b7600b3e6
commit ae21b9bde6
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_migration.c
View File

@ -1328,6 +1328,30 @@ error:
goto cleanup; goto cleanup;
} }
static void
qemuMigrationStopNBDServer(virQEMUDriverPtr driver,
virDomainObjPtr vm,
qemuMigrationCookiePtr mig)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
if (!mig->nbd)
return;
if (qemuDomainObjEnterMonitorAsync(driver, vm,
QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
return;
if (qemuMonitorNBDServerStop(priv->mon) < 0)
VIR_WARN("Unable to stop NBD server");
qemuDomainObjExitMonitor(driver, vm);
virPortAllocatorRelease(driver->remotePorts, priv->nbdPort);
priv->nbdPort = 0;
}
/* Validate whether the domain is safe to migrate. If vm is NULL, /* Validate whether the domain is safe to migrate. If vm is NULL,
* then this is being run in the v2 Prepare stage on the destination * then this is being run in the v2 Prepare stage on the destination
* (where we only have the target xml); if vm is provided, then this * (where we only have the target xml); if vm is provided, then this
@ -3803,6 +3827,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
VIR_WARN("unable to provide network data for relocation"); VIR_WARN("unable to provide network data for relocation");
} }
qemuMigrationStopNBDServer(driver, vm, mig);
if (flags & VIR_MIGRATE_PERSIST_DEST) { if (flags & VIR_MIGRATE_PERSIST_DEST) {
virDomainDefPtr vmdef; virDomainDefPtr vmdef;
if (vm->persistent) if (vm->persistent)