Re: [libvirt] [PATCH 03/11] qemu: Rename qemuMonitorMigrationCompression

[Ján Tomko]

On Tue, Jun 21, 2016 at 01:47:09PM +0200, Jiri Denemark wrote:

qemuMonitorMigrationParams is a better name for a structure which
contains various migration parameters. While doing that, we should use
full names for individual parameters.

Signed-off-by: Jiri Denemark 
---
src/qemu/qemu_migration.c| 16 
src/qemu/qemu_monitor.c  | 25 ++---
src/qemu/qemu_monitor.h  | 27 ++-
src/qemu/qemu_monitor_json.c | 32 
src/qemu/qemu_monitor_json.h |  8 
tests/qemumonitorjsontest.c  | 28 ++--
6 files changed, 70 insertions(+), 66 deletions(-)



ACK

Jan

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 03/11] qemu: Rename qemuMonitorMigrationCompression

[Jiri Denemark]

qemuMonitorMigrationParams is a better name for a structure which
contains various migration parameters. While doing that, we should use
full names for individual parameters.

Signed-off-by: Jiri Denemark 
---
 src/qemu/qemu_migration.c| 16 
 src/qemu/qemu_monitor.c  | 25 ++---
 src/qemu/qemu_monitor.h  | 27 ++-
 src/qemu/qemu_monitor_json.c | 32 
 src/qemu/qemu_monitor_json.h |  8 
 tests/qemumonitorjsontest.c  | 28 ++--
 6 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ec2b3dd..433c00c 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3436,7 +3436,7 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
 {
 int ret = -1;
 qemuDomainObjPrivatePtr priv = vm->privateData;
-qemuMonitorMigrationCompression params = { 0 };
+qemuMonitorMigrationParams migParams = { 0 };
 
 if (qemuMigrationSetOption(driver, vm,
QEMU_MONITOR_MIGRATION_CAPS_XBZRLE,
@@ -3455,16 +3455,16 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
 if (qemuDomainObjEnterMonitorAsync(driver, vm, job) < 0)
 return -1;
 
-params.level_set = compression->level_set;
-params.level = compression->level;
+migParams.compressLevel_set = compression->level_set;
+migParams.compressLevel = compression->level;
 
-params.threads_set = compression->threads_set;
-params.threads = compression->threads;
+migParams.compressThreads_set = compression->threads_set;
+migParams.compressThreads = compression->threads;
 
-params.dthreads_set = compression->dthreads_set;
-params.dthreads = compression->dthreads;
+migParams.decompressThreads_set = compression->dthreads_set;
+migParams.decompressThreads = compression->dthreads;
 
-if (qemuMonitorSetMigrationCompression(priv->mon, ) < 0)
+if (qemuMonitorSetMigrationParams(priv->mon, ) < 0)
 goto cleanup;
 
 if (compression->xbzrle_cache_set &&
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f7609e9..2862cbc 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2160,29 +2160,32 @@ qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon,
 
 
 int
-qemuMonitorGetMigrationCompression(qemuMonitorPtr mon,
-   qemuMonitorMigrationCompressionPtr compress)
+qemuMonitorGetMigrationParams(qemuMonitorPtr mon,
+  qemuMonitorMigrationParamsPtr params)
 {
 QEMU_CHECK_MONITOR_JSON(mon);
 
-return qemuMonitorJSONGetMigrationCompression(mon, compress);
+return qemuMonitorJSONGetMigrationParams(mon, params);
 }
 
 int
-qemuMonitorSetMigrationCompression(qemuMonitorPtr mon,
-   qemuMonitorMigrationCompressionPtr compress)
+qemuMonitorSetMigrationParams(qemuMonitorPtr mon,
+  qemuMonitorMigrationParamsPtr params)
 {
-VIR_DEBUG("level=%d threads=%d dthreads=%d",
-  compress->level, compress->threads, compress->dthreads);
+VIR_DEBUG("compressLevel=%d:%d compressThreads=%d:%d "
+  "decompressThreads=%d:%d",
+  params->compressLevel_set, params->compressLevel,
+  params->compressThreads_set, params->compressThreads,
+  params->decompressThreads_set, params->decompressThreads);
 
 QEMU_CHECK_MONITOR_JSON(mon);
 
-if (!compress->level_set &&
-!compress->threads_set &&
-!compress->dthreads_set)
+if (!params->compressLevel_set &&
+!params->compressThreads_set &&
+!params->decompressThreads_set)
 return 0;
 
-return qemuMonitorJSONSetMigrationCompression(mon, compress);
+return qemuMonitorJSONSetMigrationParams(mon, params);
 }
 
 
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index dd3587f..28cffc9 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -485,22 +485,23 @@ int qemuMonitorGetMigrationCacheSize(qemuMonitorPtr mon,
 int qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon,
  unsigned long long cacheSize);
 
-typedef struct _qemuMonitorMigrationCompression 
qemuMonitorMigrationCompression;
-typedef qemuMonitorMigrationCompression *qemuMonitorMigrationCompressionPtr;
-struct _qemuMonitorMigrationCompression {
-bool level_set;
-bool threads_set;
-bool dthreads_set;
+typedef struct _qemuMonitorMigrationParams qemuMonitorMigrationParams;
+typedef qemuMonitorMigrationParams *qemuMonitorMigrationParamsPtr;
+struct _qemuMonitorMigrationParams {
+bool compressLevel_set;
+int compressLevel;
 
-int level;
-int threads;
-int dthreads;
+bool compressThreads_set;
+int compressThreads;
+
+bool decompressThreads_set;
+int decompressThreads;
 };
 
-int