From 7ddcab891eba9a17798af5ff77fe0f7de00331dd Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Mon, 23 Oct 2017 17:17:58 +0200 Subject: [PATCH] qemu: Use macro for parsing ull migration parameters Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- src/qemu/qemu_monitor_json.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index cb0bb0d0df..76fc84ed05 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2687,6 +2687,9 @@ qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon, #define PARSE_INT(VAR, FIELD) \ PARSE_SET(virJSONValueObjectGetNumberInt, VAR, FIELD) +#define PARSE_ULONG(VAR, FIELD) \ + PARSE_SET(virJSONValueObjectGetNumberUlong, VAR, FIELD) + #define PARSE_STR(VAR, FIELD) \ do { \ const char *str; \ @@ -2703,15 +2706,13 @@ qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon, PARSE_INT(cpuThrottleIncrement, "cpu-throttle-increment"); PARSE_STR(migrateTLSAlias, "tls-creds"); PARSE_STR(migrateTLSHostname, "tls-hostname"); + PARSE_ULONG(downtimeLimit, "downtime-limit"); #undef PARSE_SET #undef PARSE_INT +#undef PARSE_ULONG #undef PARSE_STR - if (virJSONValueObjectGetNumberUlong(result, "downtime-limit", - ¶ms->downtimeLimit) == 0) - params->downtimeLimit_set = true; - ret = 0; cleanup: virJSONValueFree(cmd); -- 2.47.2