[libvirt] [PATCH 53/68] qemu: Move qemuMonitorMigrationParams structure
It's no longer used by the monitor code so we can hide it inside
qemu_migration_params.c.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_migration_params.c | 36 ++++++++++++++++++++++++++++++++
src/qemu/qemu_monitor.h | 36 --------------------------------
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 0c8e44f644..9f091ec693 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -38,6 +38,42 @@ VIR_LOG_INIT("qemu.qemu_migration_params");
#define QEMU_MIGRATION_TLS_ALIAS_BASE "libvirt_migrate"
+typedef struct _qemuMonitorMigrationParams qemuMonitorMigrationParams;
+typedef qemuMonitorMigrationParams *qemuMonitorMigrationParamsPtr;
+struct _qemuMonitorMigrationParams {
+ bool compressLevel_set;
+ int compressLevel;
+
+ bool compressThreads_set;
+ int compressThreads;
+
+ bool decompressThreads_set;
+ int decompressThreads;
+
+ bool cpuThrottleInitial_set;
+ int cpuThrottleInitial;
+
+ bool cpuThrottleIncrement_set;
+ int cpuThrottleIncrement;
+
+ /* Value is either NULL, "", or some string. NULL indicates no support;
+ * whereas, some string value indicates we can support setting/clearing */
+ char *tlsCreds;
+ char *tlsHostname;
+
+ bool maxBandwidth_set;
+ unsigned long long maxBandwidth;
+
+ bool downtimeLimit_set;
+ unsigned long long downtimeLimit;
+
+ bool blockIncremental_set;
+ bool blockIncremental;
+
+ bool xbzrleCacheSize_set;
+ unsigned long long xbzrleCacheSize;
+};
+
struct _qemuMigrationParams {
unsigned long long compMethods; /* bit-wise OR of qemuMigrationCompressMethod */
virBitmapPtr caps;
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index fd3c767dcf..1c49cc2370 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -642,42 +642,6 @@ int qemuMonitorGetMigrationCacheSize(qemuMonitorPtr mon,
int qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon,
unsigned long long cacheSize);
-typedef struct _qemuMonitorMigrationParams qemuMonitorMigrationParams;
-typedef qemuMonitorMigrationParams *qemuMonitorMigrationParamsPtr;
-struct _qemuMonitorMigrationParams {
- bool compressLevel_set;
- int compressLevel;
-
- bool compressThreads_set;
- int compressThreads;
-
- bool decompressThreads_set;
- int decompressThreads;
-
- bool cpuThrottleInitial_set;
- int cpuThrottleInitial;
-
- bool cpuThrottleIncrement_set;
- int cpuThrottleIncrement;
-
- /* Value is either NULL, "", or some string. NULL indicates no support;
- * whereas, some string value indicates we can support setting/clearing */
- char *tlsCreds;
- char *tlsHostname;
-
- bool maxBandwidth_set;
- unsigned long long maxBandwidth;
-
- bool downtimeLimit_set;
- unsigned long long downtimeLimit;
-
- bool blockIncremental_set;
- bool blockIncremental;
-
- bool xbzrleCacheSize_set;
- unsigned long long xbzrleCacheSize;
-};
-
int qemuMonitorGetMigrationParams(qemuMonitorPtr mon,
virJSONValuePtr *params);
int qemuMonitorSetMigrationParams(qemuMonitorPtr mon,
--
2.17.0