NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure p2p and direct migration use the new v3 protocol if available

Browse Source 
The internal virDomainMigratePeer2Peer and virDomainMigrateDirect
helper methods were not checking whether the target supports the
v3 migration protocol.

* src/libvirt.c: Use v3 migration protocol for p2p/direct
  migration if available.
This commit is contained in:
Daniel P. Berrange 2011-05-17 08:38:30 -04:00
parent 4bfe396e14
commit 2f3c682668
1 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/libvirt.c
View File

@ -3903,13 +3903,28 @@ virDomainMigratePeer2Peer (virDomainPtr domain,
/* Perform the migration. The driver isn't supposed to return /* Perform the migration. The driver isn't supposed to return
* until the migration is complete. * until the migration is complete.
*/ */
return domain->conn->driver->domainMigratePerform(domain, if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
NULL, /* cookie */ VIR_DRV_FEATURE_MIGRATION_V3)) {
0, /* cookielen */ VIR_DEBUG("Using migration protocol 3");
uri, return domain->conn->driver->domainMigratePerform3(domain,
flags, NULL, /* cookiein */
dname, 0, /* cookieinlen */
bandwidth); NULL, /* cookieoutlen */
NULL, /* cookieoutlen */
uri,
flags,
dname,
bandwidth);
} else {
VIR_DEBUG("Using migration protocol 2");
return domain->conn->driver->domainMigratePerform(domain,
NULL, /* cookie */
0, /* cookielen */
uri,
flags,
dname,
bandwidth);
}
} }
@ -3940,13 +3955,28 @@ virDomainMigrateDirect (virDomainPtr domain,
/* Perform the migration. The driver isn't supposed to return /* Perform the migration. The driver isn't supposed to return
* until the migration is complete. * until the migration is complete.
*/ */
return domain->conn->driver->domainMigratePerform(domain, if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
NULL, /* cookie */ VIR_DRV_FEATURE_MIGRATION_V3)) {
0, /* cookielen */ VIR_DEBUG("Using migration protocol 3");
uri, return domain->conn->driver->domainMigratePerform3(domain,
flags, NULL, /* cookiein */
dname, 0, /* cookieinlen */
bandwidth); NULL, /* cookieoutlen */
NULL, /* cookieoutlen */
uri,
flags,
dname,
bandwidth);
} else {
VIR_DEBUG("Using migration protocol 2");
return domain->conn->driver->domainMigratePerform(domain,
NULL, /* cookie */
0, /* cookielen */
uri,
flags,
dname,
bandwidth);
}
} }
@ -4207,6 +4237,7 @@ virDomainMigrateToURI (virDomainPtr domain,
if (flags & VIR_MIGRATE_PEER2PEER) { if (flags & VIR_MIGRATE_PEER2PEER) {
if (VIR_DRV_SUPPORTS_FEATURE (domain->conn->driver, domain->conn, if (VIR_DRV_SUPPORTS_FEATURE (domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_P2P)) { VIR_DRV_FEATURE_MIGRATION_P2P)) {
VIR_DEBUG("Using peer2peer migration");
if (virDomainMigratePeer2Peer (domain, flags, dname, duri, bandwidth) < 0) if (virDomainMigratePeer2Peer (domain, flags, dname, duri, bandwidth) < 0)
goto error; goto error;
} else { } else {
@ -4217,6 +4248,7 @@ virDomainMigrateToURI (virDomainPtr domain,
} else { } else {
if (VIR_DRV_SUPPORTS_FEATURE (domain->conn->driver, domain->conn, if (VIR_DRV_SUPPORTS_FEATURE (domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_DIRECT)) { VIR_DRV_FEATURE_MIGRATION_DIRECT)) {
VIR_DEBUG("Using direct migration");
if (virDomainMigrateDirect (domain, flags, dname, duri, bandwidth) < 0) if (virDomainMigrateDirect (domain, flags, dname, duri, bandwidth) < 0)
goto error; goto error;
} else { } else {