[libvirt] [PATCH 01/25] qemu_migration: Rename 'offline' variable in SrcPerformPeer2Peer

dubo163 dubo163 at 126.com
Tue Jul 3 09:19:13 UTC 2018


From: Jiri Denemark <jdenemar at redhat.com>

The variable is used to store the offline migration capability of the
destination daemon. Let's call it 'dstOffline' so that we can later use
'offline' to indicate whether we were asked to do offline migration.

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 9107660..c9aaa38 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4399,7 +4399,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver,
     virConnectPtr dconn = NULL;
     bool p2p;
     virErrorPtr orig_err = NULL;
-    bool offline = false;
+    bool dstOffline = false;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
     bool useParams;
 
@@ -4469,8 +4469,8 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver,
     useParams = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn,
                                          VIR_DRV_FEATURE_MIGRATION_PARAMS);
     if (flags & VIR_MIGRATE_OFFLINE)
-        offline = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn,
-                                           VIR_DRV_FEATURE_MIGRATION_OFFLINE);
+        dstOffline = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn,
+                                              VIR_DRV_FEATURE_MIGRATION_OFFLINE);
     qemuDomainObjExitRemote(vm);
 
     if (!p2p) {
@@ -4488,7 +4488,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver,
         goto cleanup;
     }
 
-    if (flags & VIR_MIGRATE_OFFLINE && !offline) {
+    if (flags & VIR_MIGRATE_OFFLINE && !dstOffline) {
         virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
                        _("offline migration is not supported by "
                          "the destination host"));
-- 
1.8.3.1





More information about the libvir-list mailing list