External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "qemu: Obtain reference on monConfig"

Browse Source 
This reverts commit a5a777a8bae61cb9e41c4dcd12d2962ad1a65a0d.

After previous commit the domain won't disappear while connecting
to monitor. There's no need to ref monitor config then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Michal Privoznik 2019-10-08 09:49:18 +02:00
parent 75dd595861
commit 8e4aa7c560
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_process.c
View File

@ -1941,7 +1941,6 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
qemuMonitorPtr mon = NULL; qemuMonitorPtr mon = NULL;
unsigned long long timeout = 0; unsigned long long timeout = 0;
virDomainChrSourceDefPtr monConfig;
if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) { if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) {
VIR_ERROR(_("Failed to set security context for monitor for %s"), VIR_ERROR(_("Failed to set security context for monitor for %s"),
@ -1956,10 +1955,9 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
timeout = vm->def->mem.total_memory / (1024 * 1024); timeout = vm->def->mem.total_memory / (1024 * 1024);
ignore_value(virTimeMillisNow(&priv->monStart)); ignore_value(virTimeMillisNow(&priv->monStart));
monConfig = virObjectRef(priv->monConfig);
mon = qemuMonitorOpen(vm, mon = qemuMonitorOpen(vm,
monConfig, priv->monConfig,
retry, retry,
timeout, timeout,
&monitorCallbacks, &monitorCallbacks,
@ -1973,7 +1971,6 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
qemuProcessMonitorLogFree); qemuProcessMonitorLogFree);
} }
virObjectUnref(monConfig);
priv->monStart = 0; priv->monStart = 0;
priv->mon = mon; priv->mon = mon;