[libvirt] [PATCH 2/2] Revert "qemu: Obtain reference on monConfig"
Daniel Henrique Barboza
danielhb413 at gmail.com
Tue Oct 8 20:15:36 UTC 2019
On 10/8/19 6:15 AM, Michal Privoznik wrote:
> 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 at redhat.com>
> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
> src/qemu/qemu_process.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index b303e5ba05..4d26b5a305 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;
>
More information about the libvir-list
mailing list