[libvirt] [PATCH v2 05/73] qemu: Move qemuMigrationCapsGet

Jiri Denemark jdenemar at redhat.com
Wed Apr 11 14:40:55 UTC 2018


The function is connected with the code which handles migration
parameters and capabilities, let's move it to qemu_migration_params.c.

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration.c        | 14 --------------
 src/qemu/qemu_migration.h        |  4 ----
 src/qemu/qemu_migration_params.c | 14 ++++++++++++++
 src/qemu/qemu_migration_params.h |  4 ++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 34eb3eb9e5..57903c7b17 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -5740,17 +5740,3 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver,
     virHashFree(blockinfo);
     return 0;
 }
-
-
-bool
-qemuMigrationCapsGet(virDomainObjPtr vm,
-                     qemuMonitorMigrationCaps cap)
-{
-    qemuDomainObjPrivatePtr priv = vm->privateData;
-    bool enabled = false;
-
-    if (priv->migrationCaps)
-        ignore_value(virBitmapGetBit(priv->migrationCaps, cap, &enabled));
-
-    return enabled;
-}
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index adf788c909..3f33d3013d 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -291,10 +291,6 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver,
                                  qemuDomainAsyncJob asyncJob,
                                  qemuDomainJobInfoPtr jobInfo);
 
-bool
-qemuMigrationCapsGet(virDomainObjPtr vm,
-                     qemuMonitorMigrationCaps cap);
-
 int
 qemuMigrationOptionSet(virQEMUDriverPtr driver,
                        virDomainObjPtr vm,
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 461df876db..f78e9ad875 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -524,3 +524,17 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
     virStringListFree(caps);
     return ret;
 }
+
+
+bool
+qemuMigrationCapsGet(virDomainObjPtr vm,
+                     qemuMonitorMigrationCaps cap)
+{
+    qemuDomainObjPrivatePtr priv = vm->privateData;
+    bool enabled = false;
+
+    if (priv->migrationCaps)
+        ignore_value(virBitmapGetBit(priv->migrationCaps, cap, &enabled));
+
+    return enabled;
+}
diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index a006357825..0a68bc0e39 100644
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -84,4 +84,8 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
                        virDomainObjPtr vm,
                        int asyncJob);
 
+bool
+qemuMigrationCapsGet(virDomainObjPtr vm,
+                     qemuMonitorMigrationCaps cap);
+
 #endif /* __QEMU_MIGRATION_PARAMS_H__ */
-- 
2.17.0




More information about the libvir-list mailing list