openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: monitor: Simplify construction of chardev backends

This commit is contained in:
Peter Krempa 2016-09-26 17:19:43 +02:00
parent 3da5008125
commit 386fe237b2
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/qemu/qemu_monitor_json.c
View File

@ -5929,22 +5929,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
@ -5953,20 +5948,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