--- src/qemu/qemu_monitor_json.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e1494df..126927e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5937,22 +5937,17 @@ qemuMonitorJSONBuildInetSocketAddress(const char *host, virJSONValuePtr addr = NULL; virJSONValuePtr data = NULL; - if (!(data = virJSONValueNewObject()) || - !(addr = virJSONValueNewObject())) - goto error; + if (virJSONValueObjectCreate(&data, "s:host", host, + "s:port", port, NULL) < 0) + return NULL; - /* port is really expected as a string here by qemu */ - if (virJSONValueObjectAppendString(data, "host", host) < 0 || - virJSONValueObjectAppendString(data, "port", port) < 0 || - virJSONValueObjectAppendString(addr, "type", "inet") < 0 || - virJSONValueObjectAppend(addr, "data", data) < 0) - goto error; + if (virJSONValueObjectCreate(&addr, "s:type", "inet", + "a:data", data, NULL) < 0) { + virJSONValueFree(data); + return NULL; + } return addr; - error: - virJSONValueFree(data); - virJSONValueFree(addr); - return NULL; } static virJSONValuePtr @@ -5961,20 +5956,16 @@ qemuMonitorJSONBuildUnixSocketAddress(const char *path) virJSONValuePtr addr = NULL; virJSONValuePtr data = NULL; - if (!(data = virJSONValueNewObject()) || - !(addr = virJSONValueNewObject())) - goto error; + if (virJSONValueObjectCreate(&data, "s:path", path, NULL) < 0) + return NULL; - if (virJSONValueObjectAppendString(data, "path", path) < 0 || - virJSONValueObjectAppendString(addr, "type", "unix") < 0 || - virJSONValueObjectAppend(addr, "data", data) < 0) - goto error; + if (virJSONValueObjectCreate(&addr, "s:type", "unix", + "a:data", data, NULL) < 0) { + virJSONValueFree(data); + return NULL; + } return addr; - error: - virJSONValueFree(data); - virJSONValueFree(addr); - return NULL; } int -- 2.10.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list