mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 17:24:53 +00:00
virsh: Use VIR_AUTO machinery in cmdQemuMonitorCommand
Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
b088e27065
commit
d2335ac577
@ -9506,14 +9506,13 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = {
|
|||||||
static bool
|
static bool
|
||||||
cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd)
|
cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd)
|
||||||
{
|
{
|
||||||
virDomainPtr dom = NULL;
|
VIR_AUTOPTR(virshDomain) dom = NULL;
|
||||||
bool ret = false;
|
VIR_AUTOFREE(char *) monitor_cmd = NULL;
|
||||||
char *monitor_cmd = NULL;
|
VIR_AUTOFREE(char *) result = NULL;
|
||||||
char *result = NULL;
|
|
||||||
unsigned int flags = 0;
|
unsigned int flags = 0;
|
||||||
const vshCmdOpt *opt = NULL;
|
const vshCmdOpt *opt = NULL;
|
||||||
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
||||||
virJSONValuePtr pretty = NULL;
|
VIR_AUTOPTR(virJSONValue) pretty = NULL;
|
||||||
|
|
||||||
VSH_EXCLUSIVE_OPTIONS("hmp", "pretty");
|
VSH_EXCLUSIVE_OPTIONS("hmp", "pretty");
|
||||||
|
|
||||||
@ -9527,7 +9526,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd)
|
|||||||
|
|
||||||
if (virBufferError(&buf)) {
|
if (virBufferError(&buf)) {
|
||||||
vshError(ctl, "%s", _("Failed to collect command"));
|
vshError(ctl, "%s", _("Failed to collect command"));
|
||||||
goto cleanup;
|
return false;
|
||||||
}
|
}
|
||||||
monitor_cmd = virBufferContentAndReset(&buf);
|
monitor_cmd = virBufferContentAndReset(&buf);
|
||||||
|
|
||||||
@ -9535,7 +9534,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd)
|
|||||||
flags |= VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP;
|
flags |= VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP;
|
||||||
|
|
||||||
if (virDomainQemuMonitorCommand(dom, monitor_cmd, &result, flags) < 0)
|
if (virDomainQemuMonitorCommand(dom, monitor_cmd, &result, flags) < 0)
|
||||||
goto cleanup;
|
return false;
|
||||||
|
|
||||||
if (vshCommandOptBool(cmd, "pretty")) {
|
if (vshCommandOptBool(cmd, "pretty")) {
|
||||||
char *tmp;
|
char *tmp;
|
||||||
@ -9549,16 +9548,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
vshPrint(ctl, "%s\n", result);
|
vshPrint(ctl, "%s\n", result);
|
||||||
|
return true;
|
||||||
ret = true;
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
VIR_FREE(result);
|
|
||||||
VIR_FREE(monitor_cmd);
|
|
||||||
virJSONValueFree(pretty);
|
|
||||||
virshDomainFree(dom);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user