From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 8 Oct 2019 07:49:18 +0000 (+0200)
Subject: Revert "qemu: Obtain reference on monConfig"
X-Git-Tag: v5.9.0-rc1~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e4aa7c560690d0aa9b4abda2c18a5f167f7de45;p=thirdparty%2Flibvirt.git

Revert "qemu: Obtain reference on monConfig"

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>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0d20427b9f..ba1ccf992a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1941,7 +1941,6 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
     qemuDomainObjPrivatePtr priv = vm->privateData;
     qemuMonitorPtr mon = NULL;
     unsigned long long timeout = 0;
-    virDomainChrSourceDefPtr monConfig;
 
     if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) {
         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);
 
     ignore_value(virTimeMillisNow(&priv->monStart));
-    monConfig = virObjectRef(priv->monConfig);
 
     mon = qemuMonitorOpen(vm,
-                          monConfig,
+                          priv->monConfig,
                           retry,
                           timeout,
                           &monitorCallbacks,
@@ -1973,7 +1971,6 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
                                 qemuProcessMonitorLogFree);
     }
 
-    virObjectUnref(monConfig);
     priv->monStart = 0;
     priv->mon = mon;