Of course I sent it too quick - one extra note...
[ ... snip... ]
> /**
> * virDomainMigrate:
> * @domain: a domain object
> @@ -3594,8 +3532,8 @@ virDomainMigrate(virDomainPtr domain,
> }
>
> VIR_DEBUG("Using peer2peer migration");
> - if (virDomainMigratePeer2PeerPlain(domain, NULL, flags, dname,
> - uri ? uri : dstURI, NULL, bandwidth) < 0) {
> + if (virDomainMigrateUnmanaged(domain, NULL, flags, dname,
> + uri ? uri : dstURI, NULL, bandwidth) < 0) {
> VIR_FREE(dstURI);
> goto error;
> }
> @@ -3815,8 +3753,8 @@ virDomainMigrate2(virDomainPtr domain,
> return NULL;
>
> VIR_DEBUG("Using peer2peer migration");
> - if (virDomainMigratePeer2PeerPlain(domain, dxml, flags, dname,
> - dstURI, uri, bandwidth) < 0) {
> + if (virDomainMigrateUnmanaged(domain, dxml, flags, dname,
> + dstURI, uri, bandwidth) < 0) {
> VIR_FREE(dstURI);
> goto error;
> }
> @@ -4196,8 +4134,8 @@ virDomainMigrateToURI(virDomainPtr domain,
> if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
> VIR_DRV_FEATURE_MIGRATION_P2P)) {
> VIR_DEBUG("Using peer2peer migration");
> - if (virDomainMigratePeer2PeerPlain(domain, NULL, flags,
> - dname, duri, NULL, bandwidth) < 0)
> + if (virDomainMigrateUnmanaged(domain, NULL, flags,
> + dname, duri, NULL, bandwidth) < 0)
> goto error;
> } else {
> /* No peer to peer migration supported */
> @@ -4208,8 +4146,8 @@ virDomainMigrateToURI(virDomainPtr domain,
> if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
> VIR_DRV_FEATURE_MIGRATION_DIRECT)) {
> VIR_DEBUG("Using direct migration");
> - if (virDomainMigrateDirect(domain, NULL, flags,
> - dname, duri, bandwidth) < 0)
> + if (virDomainMigrateUnmanaged(domain, NULL, flags,
> + dname, NULL, duri, bandwidth) < 0)
Need extra spacing ^^^
Same for other Direct to Unmanaged changes...
> goto error;
> } else {
> /* Cannot do a migration with only the perform step */
> @@ -4342,8 +4280,8 @@ virDomainMigrateToURI2(virDomainPtr domain,
> if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
> VIR_DRV_FEATURE_MIGRATION_P2P)) {
> VIR_DEBUG("Using peer2peer migration");
> - if (virDomainMigratePeer2PeerPlain(domain, dxml, flags,
> - dname, dconnuri, miguri, bandwidth) < 0)
> + if (virDomainMigrateUnmanaged(domain, dxml, flags,
> + dname, dconnuri, miguri, bandwidth) < 0)
> goto error;
> } else {
> /* No peer to peer migration supported */
> @@ -4354,8 +4292,8 @@ virDomainMigrateToURI2(virDomainPtr domain,
> if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
> VIR_DRV_FEATURE_MIGRATION_DIRECT)) {
> VIR_DEBUG("Using direct migration");
> - if (virDomainMigrateDirect(domain, dxml, flags,
> - dname, miguri, bandwidth) < 0)
> + if (virDomainMigrateUnmanaged(domain, dxml, flags,
> + dname, NULL, miguri, bandwidth) < 0)
Here
> goto error;
> } else {
> /* Cannot do a migration with only the perform step */
> @@ -4473,8 +4411,8 @@ virDomainMigrateToURI3(virDomainPtr domain,
> goto error;
> } else if (compat) {
> VIR_DEBUG("Using peer2peer migration");
> - if (virDomainMigratePeer2PeerPlain(domain, dxml, flags, dname,
> - dconnuri, uri, bandwidth) < 0)
> + if (virDomainMigrateUnmanaged(domain, dxml, flags, dname,
> + dconnuri, uri, bandwidth) < 0)
> goto error;
> } else {
> virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
> @@ -4501,8 +4439,8 @@ virDomainMigrateToURI3(virDomainPtr domain,
> }
>
> VIR_DEBUG("Using direct migration");
> - if (virDomainMigrateDirect(domain, dxml, flags,
> - dname, uri, bandwidth) < 0)
> + if (virDomainMigrateUnmanaged(domain, dxml, flags,
> + dname, NULL, uri, bandwidth) < 0)
Here
> goto error;
> }
>
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list