mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 05:45:46 +00:00
qemu_process.c: use g_autoptr() in qemuProcessQMPInitMonitor
The 'xmlopt' parameter can be auto-unref by using g_autoptr(). Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
d103db0460
commit
748c4a6b74
@ -9257,9 +9257,8 @@ qemuProcessQMPInitMonitor(qemuMonitor *mon)
|
|||||||
static int
|
static int
|
||||||
qemuProcessQMPConnectMonitor(qemuProcessQMP *proc)
|
qemuProcessQMPConnectMonitor(qemuProcessQMP *proc)
|
||||||
{
|
{
|
||||||
virDomainXMLOption *xmlopt = NULL;
|
g_autoptr(virDomainXMLOption) xmlopt = NULL;
|
||||||
virDomainChrSourceDef monConfig;
|
virDomainChrSourceDef monConfig;
|
||||||
int ret = -1;
|
|
||||||
|
|
||||||
VIR_DEBUG("proc=%p, emulator=%s, proc->pid=%lld",
|
VIR_DEBUG("proc=%p, emulator=%s, proc->pid=%lld",
|
||||||
proc, proc->binary, (long long)proc->pid);
|
proc, proc->binary, (long long)proc->pid);
|
||||||
@ -9271,25 +9270,21 @@ qemuProcessQMPConnectMonitor(qemuProcessQMP *proc)
|
|||||||
if (!(xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL)) ||
|
if (!(xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL)) ||
|
||||||
!(proc->vm = virDomainObjNew(xmlopt)) ||
|
!(proc->vm = virDomainObjNew(xmlopt)) ||
|
||||||
!(proc->vm->def = virDomainDefNew(xmlopt)))
|
!(proc->vm->def = virDomainDefNew(xmlopt)))
|
||||||
goto cleanup;
|
return -1;
|
||||||
|
|
||||||
proc->vm->pid = proc->pid;
|
proc->vm->pid = proc->pid;
|
||||||
|
|
||||||
if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, true, 0,
|
if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, true, 0,
|
||||||
virEventThreadGetContext(proc->eventThread),
|
virEventThreadGetContext(proc->eventThread),
|
||||||
&callbacks, NULL)))
|
&callbacks, NULL)))
|
||||||
goto cleanup;
|
return -1;
|
||||||
|
|
||||||
virObjectLock(proc->mon);
|
virObjectLock(proc->mon);
|
||||||
|
|
||||||
if (qemuProcessQMPInitMonitor(proc->mon) < 0)
|
if (qemuProcessQMPInitMonitor(proc->mon) < 0)
|
||||||
goto cleanup;
|
return -1;
|
||||||
|
|
||||||
ret = 0;
|
return 0;
|
||||||
|
|
||||||
cleanup:
|
|
||||||
virObjectUnref(xmlopt);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user