From: John Ferlan <jferlan@redhat.com>
Date: Mon, 23 Apr 2018 15:58:54 +0000 (-0400)
Subject: libxl: Add refcnt for args->conn during migration
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=faa148bc5d5554e6bdc412aec2c429ba677d6ed2;p=libvirt.git

libxl: Add refcnt for args->conn during migration

Since the @dconn reference via args->conn will be used via a thread
or callback, let's make sure memory associated with it isn't free'd
unexpectedly before we use it. The Unref will be done when the object
is Dispose'd.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 7fe352306c..d37a4a687a 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -239,6 +239,7 @@ libxlMigrationDstArgsDispose(void *obj)
 
     libxlMigrationCookieFree(args->migcookie);
     VIR_FREE(args->socks);
+    virObjectUnref(args->conn);
     virObjectUnref(args->vm);
 }
 
@@ -608,7 +609,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn,
     if (!(args = virObjectNew(libxlMigrationDstArgsClass)))
         goto error;
 
-    args->conn = dconn;
+    args->conn = virObjectRef(dconn);
     args->vm = virObjectRef(vm);
     args->flags = flags;
     args->migcookie = mig;
@@ -763,7 +764,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn,
     if (!(args = virObjectNew(libxlMigrationDstArgsClass)))
         goto error;
 
-    args->conn = dconn;
+    args->conn = virObjectRef(dconn);
     args->vm = virObjectRef(vm);
     args->flags = flags;
     args->socks = socks;