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

qemu: monitor: Unify and refactor 'PTY' case in qemuMonitorJSONAttachCharDev 

Use qemuMonitorJSONGetReply and unify the two blocks with the same
condition.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2022-12-01 16:47:29 +01:00
parent 80f1b8a5b0
commit 962ce78175
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_monitor_json.c
View File

@ -6578,24 +6578,19 @@ qemuMonitorJSONAttachCharDev(qemuMonitor *mon,
return -1;
if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) {
if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
return -1;
} else {
if (qemuMonitorJSONCheckError(cmd, reply) < 0)
return -1;
}
virJSONValue *data;
if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) {
virJSONValue *data = virJSONValueObjectGetObject(reply, "return");
const char *path;
if (!(data = qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_OBJECT)))
return -1;
if (!(path = virJSONValueObjectGetString(data, "pty"))) {
if (!(chr->data.file.path = g_strdup(virJSONValueObjectGetString(data, "pty")))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("chardev-add reply was missing pty path"));
return -1;
}
chr->data.file.path = g_strdup(path);
} else {
if (qemuMonitorJSONCheckError(cmd, reply) < 0)
return -1;
}
return 0;