External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 12:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMonitorJSONAttachCharDevCommand: Format only the properties

Browse Source 
Move the addition of the command wrapper to qemuMonitorJSONAttachCharDev
and rename the function to qemuMonitorJSONAttachCharDevGetProps.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-10-13 17:18:50 +02:00
parent ab85f52c38
commit d3af4392f7
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_monitor_json.c
View File

@ -6609,9 +6609,10 @@ qemuMonitorJSONBuildChrChardevReconnect(virJSONValue *object,
}
static virJSONValue *
qemuMonitorJSONAttachCharDevCommand(const char *chrID,
const virDomainChrSourceDef *chr)
qemuMonitorJSONAttachCharDevGetProps(const char *chrID,
const virDomainChrSourceDef *chr)
{
g_autoptr(virJSONValue) props = NULL;
g_autoptr(virJSONValue) backend = virJSONValueNewObject();
g_autoptr(virJSONValue) data = virJSONValueNewObject();
g_autoptr(virJSONValue) addr = NULL;
@ -6760,10 +6761,13 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID,
virJSONValueObjectAppend(backend, "data", &data) < 0)
return NULL;
return qemuMonitorJSONMakeCommand("chardev-add",
"s:id", chrID,
"a:backend", &backend,
NULL);
if (virJSONValueObjectAdd(&props,
"s:id", chrID,
"a:backend", &backend,
NULL) < 0)
return NULL;
return g_steal_pointer(&props);
}
@ -6774,8 +6778,12 @@ qemuMonitorJSONAttachCharDev(qemuMonitor *mon,
{
g_autoptr(virJSONValue) cmd = NULL;
g_autoptr(virJSONValue) reply = NULL;
g_autoptr(virJSONValue) props = NULL;
if (!(cmd = qemuMonitorJSONAttachCharDevCommand(chrID, chr)))
if (!(props = qemuMonitorJSONAttachCharDevGetProps(chrID, chr)))
return -1;
if (!(cmd = qemuMonitorJSONMakeCommandInternal("chardev-add", &props)))
return -1;
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)