External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Rename qemuMonitorMigrationCompression

Browse Source 
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 <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-06-20 15:47:46 +02:00
parent dbcbc86648
commit b1473708d8
6 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_migration.c
View File

@ -3436,7 +3436,7 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
{ {
int ret = -1; int ret = -1;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
qemuMonitorMigrationCompression params = { 0 }; qemuMonitorMigrationParams migParams = { 0 };
if (qemuMigrationSetOption(driver, vm, if (qemuMigrationSetOption(driver, vm,
QEMU_MONITOR_MIGRATION_CAPS_XBZRLE, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE,
@ -3455,16 +3455,16 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
if (qemuDomainObjEnterMonitorAsync(driver, vm, job) < 0) if (qemuDomainObjEnterMonitorAsync(driver, vm, job) < 0)
return -1; return -1;
params.level_set = compression->level_set; migParams.compressLevel_set = compression->level_set;
params.level = compression->level; migParams.compressLevel = compression->level;
params.threads_set = compression->threads_set; migParams.compressThreads_set = compression->threads_set;
params.threads = compression->threads; migParams.compressThreads = compression->threads;
params.dthreads_set = compression->dthreads_set; migParams.decompressThreads_set = compression->dthreads_set;
params.dthreads = compression->dthreads; migParams.decompressThreads = compression->dthreads;
if (qemuMonitorSetMigrationCompression(priv->mon, &params) < 0) if (qemuMonitorSetMigrationParams(priv->mon, &migParams) < 0)
goto cleanup; goto cleanup;
if (compression->xbzrle_cache_set && if (compression->xbzrle_cache_set &&

25
src/qemu/qemu_monitor.c
View File

@ -2160,29 +2160,32 @@ qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon,
int int
qemuMonitorGetMigrationCompression(qemuMonitorPtr mon, qemuMonitorGetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress) qemuMonitorMigrationParamsPtr params)
{ {
QEMU_CHECK_MONITOR_JSON(mon); QEMU_CHECK_MONITOR_JSON(mon);
return qemuMonitorJSONGetMigrationCompression(mon, compress); return qemuMonitorJSONGetMigrationParams(mon, params);
} }
int int
qemuMonitorSetMigrationCompression(qemuMonitorPtr mon, qemuMonitorSetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress) qemuMonitorMigrationParamsPtr params)
{ {
VIR_DEBUG("level=%d threads=%d dthreads=%d", VIR_DEBUG("compressLevel=%d:%d compressThreads=%d:%d "
compress->level, compress->threads, compress->dthreads); "decompressThreads=%d:%d",
params->compressLevel_set, params->compressLevel,
params->compressThreads_set, params->compressThreads,
params->decompressThreads_set, params->decompressThreads);
QEMU_CHECK_MONITOR_JSON(mon); QEMU_CHECK_MONITOR_JSON(mon);
if (!compress->level_set && if (!params->compressLevel_set &&
!compress->threads_set && !params->compressThreads_set &&
!compress->dthreads_set) !params->decompressThreads_set)
return 0; return 0;
return qemuMonitorJSONSetMigrationCompression(mon, compress); return qemuMonitorJSONSetMigrationParams(mon, params);
} }

27
src/qemu/qemu_monitor.h
View File

@ -485,22 +485,23 @@ int qemuMonitorGetMigrationCacheSize(qemuMonitorPtr mon,
int qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon, int qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon,
unsigned long long cacheSize); unsigned long long cacheSize);
typedef struct _qemuMonitorMigrationCompression qemuMonitorMigrationCompression; typedef struct _qemuMonitorMigrationParams qemuMonitorMigrationParams;
typedef qemuMonitorMigrationCompression *qemuMonitorMigrationCompressionPtr; typedef qemuMonitorMigrationParams *qemuMonitorMigrationParamsPtr;
struct _qemuMonitorMigrationCompression { struct _qemuMonitorMigrationParams {
bool level_set; bool compressLevel_set;
bool threads_set; int compressLevel;
bool dthreads_set;
int level; bool compressThreads_set;
int threads; int compressThreads;
int dthreads;
bool decompressThreads_set;
int decompressThreads;
}; };
int qemuMonitorGetMigrationCompression(qemuMonitorPtr mon, int qemuMonitorGetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress); qemuMonitorMigrationParamsPtr params);
int qemuMonitorSetMigrationCompression(qemuMonitorPtr mon, int qemuMonitorSetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress); qemuMonitorMigrationParamsPtr params);
typedef enum { typedef enum {
QEMU_MONITOR_MIGRATION_STATUS_INACTIVE, QEMU_MONITOR_MIGRATION_STATUS_INACTIVE,

32
src/qemu/qemu_monitor_json.c
View File

@ -2529,8 +2529,8 @@ qemuMonitorJSONSetMigrationCacheSize(qemuMonitorPtr mon,
int int
qemuMonitorJSONGetMigrationCompression(qemuMonitorPtr mon, qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress) qemuMonitorMigrationParamsPtr params)
{ {
int ret = -1; int ret = -1;
virJSONValuePtr result; virJSONValuePtr result;
@ -2549,31 +2549,31 @@ qemuMonitorJSONGetMigrationCompression(qemuMonitorPtr mon,
result = virJSONValueObjectGet(reply, "return"); result = virJSONValueObjectGet(reply, "return");
if (virJSONValueObjectGetNumberInt(result, "compress-level", if (virJSONValueObjectGetNumberInt(result, "compress-level",
&compress->level) < 0) { &params->compressLevel) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed/missing compress-level " _("malformed/missing compress-level "
"in migrate parameters")); "in migrate parameters"));
goto cleanup; goto cleanup;
} }
compress->level_set = true; params->compressLevel_set = true;
if (virJSONValueObjectGetNumberInt(result, "compress-threads", if (virJSONValueObjectGetNumberInt(result, "compress-threads",
&compress->threads) < 0) { &params->compressThreads) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed/missing compress-threads " _("malformed/missing compress-threads "
"in migrate parameters")); "in migrate parameters"));
goto cleanup; goto cleanup;
} }
compress->threads_set = true; params->compressThreads_set = true;
if (virJSONValueObjectGetNumberInt(result, "decompress-threads", if (virJSONValueObjectGetNumberInt(result, "decompress-threads",
&compress->dthreads) < 0) { &params->decompressThreads) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed/missing decompress-threads " _("malformed/missing decompress-threads "
"in migrate parameters")); "in migrate parameters"));
goto cleanup; goto cleanup;
} }
compress->dthreads_set = true; params->decompressThreads_set = true;
ret = 0; ret = 0;
cleanup: cleanup:
@ -2583,8 +2583,8 @@ qemuMonitorJSONGetMigrationCompression(qemuMonitorPtr mon,
} }
int int
qemuMonitorJSONSetMigrationCompression(qemuMonitorPtr mon, qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress) qemuMonitorMigrationParamsPtr params)
{ {
int ret = -1; int ret = -1;
virJSONValuePtr cmd = NULL; virJSONValuePtr cmd = NULL;
@ -2601,19 +2601,19 @@ qemuMonitorJSONSetMigrationCompression(qemuMonitorPtr mon,
if (!(args = virJSONValueNewObject())) if (!(args = virJSONValueNewObject()))
goto cleanup; goto cleanup;
if (compress->level_set && if (params->compressLevel_set &&
virJSONValueObjectAppendNumberInt(args, "compress-level", virJSONValueObjectAppendNumberInt(args, "compress-level",
compress->level) < 0) params->compressLevel) < 0)
goto cleanup; goto cleanup;
if (compress->threads_set && if (params->compressThreads_set &&
virJSONValueObjectAppendNumberInt(args, "compress-threads", virJSONValueObjectAppendNumberInt(args, "compress-threads",
compress->threads) < 0) params->compressThreads) < 0)
goto cleanup; goto cleanup;
if (compress->dthreads_set && if (params->decompressThreads_set &&
virJSONValueObjectAppendNumberInt(args, "decompress-threads", virJSONValueObjectAppendNumberInt(args, "decompress-threads",
compress->dthreads) < 0) params->decompressThreads) < 0)
goto cleanup; goto cleanup;
if (virJSONValueObjectAppend(cmd, "arguments", args) < 0) if (virJSONValueObjectAppend(cmd, "arguments", args) < 0)

8
src/qemu/qemu_monitor_json.h
View File

@ -131,10 +131,10 @@ int qemuMonitorJSONGetMigrationCacheSize(qemuMonitorPtr mon,
int qemuMonitorJSONSetMigrationCacheSize(qemuMonitorPtr mon, int qemuMonitorJSONSetMigrationCacheSize(qemuMonitorPtr mon,
unsigned long long cacheSize); unsigned long long cacheSize);
int qemuMonitorJSONGetMigrationCompression(qemuMonitorPtr mon, int qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress); qemuMonitorMigrationParamsPtr params);
int qemuMonitorJSONSetMigrationCompression(qemuMonitorPtr mon, int qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon,
qemuMonitorMigrationCompressionPtr compress); qemuMonitorMigrationParamsPtr params);
int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon, int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon,
qemuMonitorMigrationStatsPtr stats); qemuMonitorMigrationStatsPtr stats);

28
tests/qemumonitorjsontest.c
View File

@ -1616,11 +1616,11 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockStatsInfo(const void *data)
} }
static int static int
testQemuMonitorJSONqemuMonitorJSONGetMigrationCompression(const void *data) testQemuMonitorJSONqemuMonitorJSONGetMigrationParams(const void *data)
{ {
virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt);
qemuMonitorMigrationCompression compress; qemuMonitorMigrationParams params;
int ret = -1; int ret = -1;
if (!test) if (!test)
@ -1637,34 +1637,34 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCompression(const void *data)
goto cleanup; goto cleanup;
} }
if (qemuMonitorJSONGetMigrationCompression(qemuMonitorTestGetMonitor(test), if (qemuMonitorJSONGetMigrationParams(qemuMonitorTestGetMonitor(test),
&compress) < 0) &params) < 0)
goto cleanup; goto cleanup;
if (!compress.level_set || if (!params.compressLevel_set ||
!compress.threads_set || !params.compressThreads_set ||
!compress.dthreads_set) { !params.decompressThreads_set) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"One of level, threads or dthreads flags is not set"); "One of level, threads or dthreads flags is not set");
return -1; return -1;
} }
if (compress.level != 1) { if (params.compressLevel != 1) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"Invalid decompress-threads: %d, expected 1", "Invalid decompress-threads: %d, expected 1",
compress.level); params.compressLevel);
goto cleanup; goto cleanup;
} }
if (compress.threads != 8) { if (params.compressThreads != 8) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"Invalid decompress-threads: %d, expected 8", "Invalid decompress-threads: %d, expected 8",
compress.threads); params.compressThreads);
goto cleanup; goto cleanup;
} }
if (compress.dthreads != 2) { if (params.decompressThreads != 2) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"Invalid decompress-threads: %d, expected 2", "Invalid decompress-threads: %d, expected 2",
compress.dthreads); params.decompressThreads);
goto cleanup; goto cleanup;
} }
ret = 0; ret = 0;
@ -2416,7 +2416,7 @@ mymain(void)
DO_TEST(qemuMonitorJSONGetBlockInfo); DO_TEST(qemuMonitorJSONGetBlockInfo);
DO_TEST(qemuMonitorJSONGetBlockStatsInfo); DO_TEST(qemuMonitorJSONGetBlockStatsInfo);
DO_TEST(qemuMonitorJSONGetMigrationCacheSize); DO_TEST(qemuMonitorJSONGetMigrationCacheSize);
DO_TEST(qemuMonitorJSONGetMigrationCompression); DO_TEST(qemuMonitorJSONGetMigrationParams);
DO_TEST(qemuMonitorJSONGetMigrationStats); DO_TEST(qemuMonitorJSONGetMigrationStats);
DO_TEST(qemuMonitorJSONGetChardevInfo); DO_TEST(qemuMonitorJSONGetChardevInfo);
DO_TEST(qemuMonitorJSONSetBlockIoThrottle); DO_TEST(qemuMonitorJSONSetBlockIoThrottle);