From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Fri, 2 Oct 2015 07:52:43 +0000 (+0300)
Subject: migration: move implementation check to branches in p2p
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=341216a0af91d86ca3940ba4da4a034f885ea14e;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

migration: move implementation check to branches in p2p

This is more structured code so it will be easier to add branch for _PARAMS
protocol here. It is not a pure refactoring strictly speaking as we remove
scenarios for broken cases when driver defines V3 feature and implements
perform function. So it is additionally a more solid code.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
---

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 35d60d004..83245fe9e 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -3339,23 +3339,25 @@ virDomainMigratePeer2PeerPlain(virDomainPtr domain,
                      dconnuri, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri),
                      bandwidth, flags);
 
-    if (!domain->conn->driver->domainMigratePerform &&
-        !domain->conn->driver->domainMigratePerform3) {
-        virReportUnsupportedError();
-        return -1;
-    }
-
     if (virDomainMigrateCheckNotLocal(dconnuri) < 0)
         return -1;
 
     if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
                                  VIR_DRV_FEATURE_MIGRATION_V3)) {
         VIR_DEBUG("Using migration protocol 3");
+        if (!domain->conn->driver->domainMigratePerform3) {
+            virReportUnsupportedError();
+            return -1;
+        }
         return domain->conn->driver->domainMigratePerform3
                 (domain, xmlin, NULL, 0, NULL, NULL, dconnuri,
                  uri, flags, dname, bandwidth);
     } else {
         VIR_DEBUG("Using migration protocol 2");
+        if (!domain->conn->driver->domainMigratePerform) {
+            virReportUnsupportedError();
+            return -1;
+        }
         if (xmlin) {
             virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
                            _("Unable to change target guest XML during "