qemu: Move qemuMonitorMigrationCaps enum

Since the monitor code no longer needs to see this enum, we move it
to the place where migration parameters are defined and drop the
"monitor" reference from the name.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4ec6f1190214efbb64c9922bdb8fc9a24782e4e8..8a285f6883404ae2dc958c206585b1ea76c1b195 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13605,7 +13605,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
 
     priv = vm->privateData;
 
-    if (!qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) {
+    if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("Compressed migration is not supported by "
                          "QEMU binary"));
@@ -13656,7 +13656,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
 
     priv = vm->privateData;
 
-    if (!qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) {
+    if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("Compressed migration is not supported by "
                          "QEMU binary"));

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 548bb1c0dd67764b856e518533500799a29cd956..2723288dfc7760232c6fb88ebb0ca7747d283b29 100644 (file)
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -76,6 +76,17 @@ VIR_ENUM_IMPL(qemuMigrationCompressMethod, QEMU_MIGRATION_COMPRESS_LAST,
               "mt",
 );
 
+VIR_ENUM_IMPL(qemuMigrationCapability, QEMU_MIGRATION_CAP_LAST,
+              "xbzrle",
+              "auto-converge",
+              "rdma-pin-all",
+              "events",
+              "postcopy-ram",
+              "compress",
+              "pause-before-switchover",
+);
+
+
 VIR_ENUM_DECL(qemuMigrationParam)
 VIR_ENUM_IMPL(qemuMigrationParam, QEMU_MIGRATION_PARAM_LAST,
               "compress-level",
@@ -93,36 +104,36 @@ VIR_ENUM_IMPL(qemuMigrationParam, QEMU_MIGRATION_PARAM_LAST,
 
 typedef struct _qemuMigrationParamsAlwaysOnItem qemuMigrationParamsAlwaysOnItem;
 struct _qemuMigrationParamsAlwaysOnItem {
-    qemuMonitorMigrationCaps cap;
+    qemuMigrationCapability cap;
     int party; /* bit-wise OR of qemuMigrationParty */
 };
 
 typedef struct _qemuMigrationParamsFlagMapItem qemuMigrationParamsFlagMapItem;
 struct _qemuMigrationParamsFlagMapItem {
     virDomainMigrateFlags flag;
-    qemuMonitorMigrationCaps cap;
+    qemuMigrationCapability cap;
     int party; /* bit-wise OR of qemuMigrationParty */
 };
 
 /* Migration capabilities which should always be enabled as long as they
  * are supported by QEMU. */
 static const qemuMigrationParamsAlwaysOnItem qemuMigrationParamsAlwaysOn[] = {
-    {QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER,
+    {QEMU_MIGRATION_CAP_PAUSE_BEFORE_SWITCHOVER,
      QEMU_MIGRATION_SOURCE},
 };
 
-/* Translation from virDomainMigrateFlags to qemuMonitorMigrationCaps. */
+/* Translation from virDomainMigrateFlags to qemuMigrationCapability. */
 static const qemuMigrationParamsFlagMapItem qemuMigrationParamsFlagMap[] = {
     {VIR_MIGRATE_RDMA_PIN_ALL,
-     QEMU_MONITOR_MIGRATION_CAPS_RDMA_PIN_ALL,
+     QEMU_MIGRATION_CAP_RDMA_PIN_ALL,
      QEMU_MIGRATION_SOURCE | QEMU_MIGRATION_DESTINATION},
 
     {VIR_MIGRATE_AUTO_CONVERGE,
-     QEMU_MONITOR_MIGRATION_CAPS_AUTO_CONVERGE,
+     QEMU_MIGRATION_CAP_AUTO_CONVERGE,
      QEMU_MIGRATION_SOURCE},
 
     {VIR_MIGRATE_POSTCOPY,
-     QEMU_MONITOR_MIGRATION_CAPS_POSTCOPY,
+     QEMU_MIGRATION_CAP_POSTCOPY,
      QEMU_MIGRATION_SOURCE | QEMU_MIGRATION_DESTINATION},
 };
 
@@ -150,7 +161,7 @@ qemuMigrationParamsNew(void)
     if (VIR_ALLOC(params) < 0)
         return NULL;
 
-    params->caps = virBitmapNew(QEMU_MONITOR_MIGRATION_CAPS_LAST);
+    params->caps = virBitmapNew(QEMU_MIGRATION_CAP_LAST);
     if (!params->caps)
         goto error;
 
@@ -289,7 +300,7 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params,
 {
     size_t i;
     int method;
-    qemuMonitorMigrationCaps cap;
+    qemuMigrationCapability cap;
 
     for (i = 0; i < nparams; i++) {
         if (STRNEQ(params[i].field, VIR_MIGRATE_PARAM_COMPRESSION))
@@ -314,11 +325,11 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params,
 
         switch ((qemuMigrationCompressMethod) method) {
         case QEMU_MIGRATION_COMPRESS_XBZRLE:
-            cap = QEMU_MONITOR_MIGRATION_CAPS_XBZRLE;
+            cap = QEMU_MIGRATION_CAP_XBZRLE;
             break;
 
         case QEMU_MIGRATION_COMPRESS_MT:
-            cap = QEMU_MONITOR_MIGRATION_CAPS_COMPRESS;
+            cap = QEMU_MIGRATION_CAP_COMPRESS;
             break;
 
         case QEMU_MIGRATION_COMPRESS_LAST:
@@ -371,7 +382,7 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params,
     if (!migParams->compMethods && (flags & VIR_MIGRATE_COMPRESSED)) {
         migParams->compMethods = 1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE;
         ignore_value(virBitmapSetBit(migParams->caps,
-                                     QEMU_MONITOR_MIGRATION_CAPS_XBZRLE));
+                                     QEMU_MIGRATION_CAP_XBZRLE));
     }
 
     return 0;
@@ -394,12 +405,12 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr params,
         return NULL;
 
     for (i = 0; i < ARRAY_CARDINALITY(qemuMigrationParamsFlagMap); i++) {
-        qemuMonitorMigrationCaps cap = qemuMigrationParamsFlagMap[i].cap;
+        qemuMigrationCapability cap = qemuMigrationParamsFlagMap[i].cap;
 
         if (qemuMigrationParamsFlagMap[i].party & party &&
             flags & qemuMigrationParamsFlagMap[i].flag) {
             VIR_DEBUG("Enabling migration capability '%s'",
-                      qemuMonitorMigrationCapsTypeToString(cap));
+                      qemuMigrationCapabilityTypeToString(cap));
             ignore_value(virBitmapSetBit(migParams->caps, cap));
         }
     }
@@ -597,13 +608,13 @@ qemuMigrationCapsToJSON(virBitmapPtr caps,
 {
     virJSONValuePtr json = NULL;
     virJSONValuePtr cap = NULL;
-    qemuMonitorMigrationCaps bit;
+    qemuMigrationCapability bit;
     const char *name;
 
     if (!(json = virJSONValueNewArray()))
         return NULL;
 
-    for (bit = 0; bit < QEMU_MONITOR_MIGRATION_CAPS_LAST; bit++) {
+    for (bit = 0; bit < QEMU_MIGRATION_CAP_LAST; bit++) {
         bool supported = false;
         bool state = false;
 
@@ -616,7 +627,7 @@ qemuMigrationCapsToJSON(virBitmapPtr caps,
         if (!(cap = virJSONValueNewObject()))
             goto error;
 
-        name = qemuMonitorMigrationCapsTypeToString(bit);
+        name = qemuMigrationCapabilityTypeToString(bit);
         if (virJSONValueObjectAppendString(cap, "capability", name) < 0)
             goto error;
 
@@ -947,7 +958,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver,
                          qemuMigrationParamsPtr migParams)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
-    qemuMonitorMigrationCaps cap;
+    qemuMigrationCapability cap;
     qemuMigrationParty party;
     size_t i;
 
@@ -956,7 +967,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver,
     else
         party = QEMU_MIGRATION_DESTINATION;
 
-    for (cap = 0; cap < QEMU_MONITOR_MIGRATION_CAPS_LAST; cap++) {
+    for (cap = 0; cap < QEMU_MIGRATION_CAP_LAST; cap++) {
         bool state = false;
 
         ignore_value(virBitmapGetBit(migParams->caps, cap, &state));
@@ -964,7 +975,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver,
         if (state && !qemuMigrationCapsGet(vm, cap)) {
             virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
                            _("Migration option '%s' is not supported by QEMU binary"),
-                           qemuMonitorMigrationCapsTypeToString(cap));
+                           qemuMigrationCapabilityTypeToString(cap));
             return -1;
         }
     }
@@ -975,7 +986,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver,
         if (qemuMigrationParamsAlwaysOn[i].party & party &&
             qemuMigrationCapsGet(vm, cap)) {
             VIR_DEBUG("Enabling migration capability '%s'",
-                      qemuMonitorMigrationCapsTypeToString(cap));
+                      qemuMigrationCapabilityTypeToString(cap));
             ignore_value(virBitmapSetBit(migParams->caps, cap));
         }
     }
@@ -1047,12 +1058,12 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
         goto cleanup;
     }
 
-    priv->migrationCaps = virBitmapNew(QEMU_MONITOR_MIGRATION_CAPS_LAST);
+    priv->migrationCaps = virBitmapNew(QEMU_MIGRATION_CAP_LAST);
     if (!priv->migrationCaps)
         goto cleanup;
 
     for (capStr = caps; *capStr; capStr++) {
-        int cap = qemuMonitorMigrationCapsTypeFromString(*capStr);
+        int cap = qemuMigrationCapabilityTypeFromString(*capStr);
 
         if (cap < 0) {
             VIR_DEBUG("Unknown migration capability: '%s'", *capStr);
@@ -1063,11 +1074,11 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
     }
 
     if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT)) {
-        migEvent = virBitmapNew(QEMU_MONITOR_MIGRATION_CAPS_LAST);
+        migEvent = virBitmapNew(QEMU_MIGRATION_CAP_LAST);
         if (!migEvent)
             goto cleanup;
 
-        ignore_value(virBitmapSetBit(migEvent, QEMU_MONITOR_MIGRATION_CAPS_EVENTS));
+        ignore_value(virBitmapSetBit(migEvent, QEMU_MIGRATION_CAP_EVENTS));
 
         if (!(json = qemuMigrationCapsToJSON(migEvent, migEvent)))
             goto cleanup;
@@ -1093,7 +1104,7 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
      * else.
      */
     ignore_value(virBitmapClearBit(priv->migrationCaps,
-                                   QEMU_MONITOR_MIGRATION_CAPS_EVENTS));
+                                   QEMU_MIGRATION_CAP_EVENTS));
 
     ret = 0;
 
@@ -1106,7 +1117,7 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
 
 bool
 qemuMigrationCapsGet(virDomainObjPtr vm,
-                     qemuMonitorMigrationCaps cap)
+                     qemuMigrationCapability cap)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
     bool enabled = false;

diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index 76b26a50d45170d91993e66b227d70df744c1315..ceba0eb68a143b072dc581265ffdc56094a63821 100644 (file)
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -27,6 +27,19 @@
 # include "qemu_monitor.h"
 # include "qemu_conf.h"
 
+typedef enum {
+    QEMU_MIGRATION_CAP_XBZRLE,
+    QEMU_MIGRATION_CAP_AUTO_CONVERGE,
+    QEMU_MIGRATION_CAP_RDMA_PIN_ALL,
+    QEMU_MIGRATION_CAP_EVENTS,
+    QEMU_MIGRATION_CAP_POSTCOPY,
+    QEMU_MIGRATION_CAP_COMPRESS,
+    QEMU_MIGRATION_CAP_PAUSE_BEFORE_SWITCHOVER,
+
+    QEMU_MIGRATION_CAP_LAST
+} qemuMigrationCapability;
+VIR_ENUM_DECL(qemuMigrationCapability)
+
 typedef enum {
     QEMU_MIGRATION_PARAM_COMPRESS_LEVEL,
     QEMU_MIGRATION_PARAM_COMPRESS_THREADS,
@@ -122,6 +135,6 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
 
 bool
 qemuMigrationCapsGet(virDomainObjPtr vm,
-                     qemuMonitorMigrationCaps cap);
+                     qemuMigrationCapability cap);
 
 #endif /* __QEMU_MIGRATION_PARAMS_H__ */

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 50036919c4b106ba4c24a9b7aec6298d56c4ffba..ec15f79e76734f7419d45d88790463c054677eeb 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -185,11 +185,6 @@ VIR_ENUM_IMPL(qemuMonitorMigrationStatus,
               "completed", "failed",
               "cancelling", "cancelled")
 
-VIR_ENUM_IMPL(qemuMonitorMigrationCaps,
-              QEMU_MONITOR_MIGRATION_CAPS_LAST,
-              "xbzrle", "auto-converge", "rdma-pin-all", "events",
-              "postcopy-ram", "compress", "pause-before-switchover")
-
 VIR_ENUM_IMPL(qemuMonitorVMStatus,
               QEMU_MONITOR_VM_STATUS_LAST,
               "debug", "inmigrate", "internal-error", "io-error", "paused",

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index e444d0a068ac0c7ddb2507e52b75d3ccd0635a19..65702eae05eaa62ac333f72a9f87c5abf00afb88 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -711,20 +711,6 @@ int qemuMonitorGetMigrationStats(qemuMonitorPtr mon,
                                  qemuMonitorMigrationStatsPtr stats,
                                  char **error);
 
-typedef enum {
-    QEMU_MONITOR_MIGRATION_CAPS_XBZRLE,
-    QEMU_MONITOR_MIGRATION_CAPS_AUTO_CONVERGE,
-    QEMU_MONITOR_MIGRATION_CAPS_RDMA_PIN_ALL,
-    QEMU_MONITOR_MIGRATION_CAPS_EVENTS,
-    QEMU_MONITOR_MIGRATION_CAPS_POSTCOPY,
-    QEMU_MONITOR_MIGRATION_CAPS_COMPRESS,
-    QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER,
-
-    QEMU_MONITOR_MIGRATION_CAPS_LAST
-} qemuMonitorMigrationCaps;
-
-VIR_ENUM_DECL(qemuMonitorMigrationCaps);
-
 int qemuMonitorGetMigrationCapabilities(qemuMonitorPtr mon,
                                         char ***capabilities);
 int qemuMonitorSetMigrationCapabilities(qemuMonitorPtr mon,

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 697126f2985601e9533cb9f2f1122d13762f0633..44a7a2d444db476e983d04317b69cd1a390325a6 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -32,6 +32,7 @@
 #include "virstring.h"
 #include "cpu/cpu.h"
 #include "qemu/qemu_monitor.h"
+#include "qemu/qemu_migration_params.h"
 #include "qemu/qemu_migration_paramspriv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
@@ -2166,18 +2167,18 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *data)
                                             &caps) < 0)
         goto cleanup;
 
-    cap = qemuMonitorMigrationCapsTypeToString(QEMU_MONITOR_MIGRATION_CAPS_XBZRLE);
+    cap = qemuMigrationCapabilityTypeToString(QEMU_MIGRATION_CAP_XBZRLE);
     if (!virStringListHasString((const char **) caps, cap)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "Expected capability %s is missing", cap);
         goto cleanup;
     }
 
-    bitmap = virBitmapNew(QEMU_MONITOR_MIGRATION_CAPS_LAST);
+    bitmap = virBitmapNew(QEMU_MIGRATION_CAP_LAST);
     if (!bitmap)
         goto cleanup;
 
-    ignore_value(virBitmapSetBit(bitmap, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE));
+    ignore_value(virBitmapSetBit(bitmap, QEMU_MIGRATION_CAP_XBZRLE));
     if (!(json = qemuMigrationCapsToJSON(bitmap, bitmap)))
         goto cleanup;