James Fehlig
8af0df1210
Add fixes from SLE12 SP1 to Factory libvirt package. - Replace local libxl patches with upstream variants Dropped: 0003-libxl-fix-ref-counting-of-libxlMigrationDstArgs.patch 0004-libxl-don-t-attempt-to-resume-domain-when-suspend-fa.patch 0005-libxl-acquire-a-job-when-receiving-a-migrating-domai.patch Added: 44a54eb0-libxl-fix-refcnt-MigrationDstArgs.patch 15120b8c-libxl-no-resume-on-suspend-fail.patch e80b84a7-libxl-acquire-job-on-migrate.patch bsc#936185 - Added another virt-aa-helper upstream patch 52970dec-virt-aa-helper-improve-valid-path.patch lp#1483071 - Added upstream patch to fix libvirt-tck memory balloon test failure on Xen 60acb38-revert-curmem-inactive-dom.patch - Fix generated apparmor profile to allow access to ovmf and nvram. 26c5fa3a-virt-aa-helper-missing-doc.patch 2f01cfdf-virt-aa-helper-allow-ovmf.patch 91fdcefa-virt-aa-helper-allow-nvram.patch d25a5e08-virt-aa-helper-simplify-restriction-logic.patch lp#1483071 OBS-URL: https://build.opensuse.org/request/show/327805 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=479
110 lines
3.9 KiB
Diff
110 lines
3.9 KiB
Diff
commit 44a54eb073d2ae52ebf1661ae73bb1f0f98599f9
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Wed Jul 15 16:35:50 2015 -0600
|
|
|
|
libxl: fix ref counting of libxlMigrationDstArgs
|
|
|
|
This patch fixes some flawed logic around ref counting the
|
|
libxlMigrationDstArgs object.
|
|
|
|
First, when adding sockets to the event loop with
|
|
virNetSocketAddIOCallback(), the generic virObjectFreeCallback()
|
|
was registered as a free function, with libxlMigrationDstArgs as
|
|
its parameter. A reference was also taken on
|
|
libxlMigrationDstArgs for each successful call to
|
|
virNetSocketAddIOCallback(). The rational behind this logic was
|
|
that the libxlMigrationDstArgs object had to out-live the socket
|
|
objects. But virNetSocketAddIOCallback() already takes a
|
|
reference on socket objects, ensuring their life until removed
|
|
from the event loop and unref'ed in virNetSocketEventFree(). We
|
|
only need to ensure libxlMigrationDstArgs lives until
|
|
libxlDoMigrateReceive() finishes, which can be done by simply
|
|
unref'ing libxlMigrationDstArgs at the end of
|
|
libxlDoMigrateReceive().
|
|
|
|
The second flaw was unref'ing the sockets in the failure path of
|
|
libxlMigrateReceive() and at the end of libxlDoMigrateReceive().
|
|
As mentioned above, the sockets are already unref'ed by
|
|
virNetSocketEventFree() when removed from the event loop.
|
|
Attempting to unref the socket a second time resulted in a
|
|
libvirtd crash since the socket was previously unref'ed and
|
|
disposed.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
|
Index: libvirt-1.2.18/src/libxl/libxl_migration.c
|
|
===================================================================
|
|
--- libvirt-1.2.18.orig/src/libxl/libxl_migration.c
|
|
+++ libvirt-1.2.18/src/libxl/libxl_migration.c
|
|
@@ -109,7 +109,6 @@ libxlDoMigrateReceive(void *opaque)
|
|
|
|
/* Remove all listen socks from event handler, and close them. */
|
|
for (i = 0; i < nsocks; i++) {
|
|
- virNetSocketUpdateIOCallback(socks[i], 0);
|
|
virNetSocketRemoveIOCallback(socks[i]);
|
|
virNetSocketClose(socks[i]);
|
|
virObjectUnref(socks[i]);
|
|
@@ -117,6 +116,7 @@ libxlDoMigrateReceive(void *opaque)
|
|
}
|
|
args->nsocks = 0;
|
|
VIR_FORCE_CLOSE(recvfd);
|
|
+ virObjectUnref(args);
|
|
}
|
|
|
|
|
|
@@ -164,11 +164,11 @@ libxlMigrateReceive(virNetSocketPtr sock
|
|
virNetSocketUpdateIOCallback(socks[i], 0);
|
|
virNetSocketRemoveIOCallback(socks[i]);
|
|
virNetSocketClose(socks[i]);
|
|
- virObjectUnref(socks[i]);
|
|
socks[i] = NULL;
|
|
}
|
|
args->nsocks = 0;
|
|
VIR_FORCE_CLOSE(recvfd);
|
|
+ virObjectUnref(args);
|
|
}
|
|
|
|
static int
|
|
@@ -318,7 +318,7 @@ libxlDomainMigrationPrepare(virConnectPt
|
|
virNetSocketPtr *socks = NULL;
|
|
size_t nsocks = 0;
|
|
int nsocks_listen = 0;
|
|
- libxlMigrationDstArgs *args;
|
|
+ libxlMigrationDstArgs *args = NULL;
|
|
size_t i;
|
|
int ret = -1;
|
|
|
|
@@ -420,22 +420,12 @@ libxlDomainMigrationPrepare(virConnectPt
|
|
VIR_EVENT_HANDLE_READABLE,
|
|
libxlMigrateReceive,
|
|
args,
|
|
- virObjectFreeCallback) < 0)
|
|
+ NULL) < 0)
|
|
continue;
|
|
|
|
- /*
|
|
- * Successfully added sock to event loop. Take a ref on args to
|
|
- * ensure it is not freed until sock is removed from the event loop.
|
|
- * Ref is dropped in virObjectFreeCallback after being removed
|
|
- * from the event loop.
|
|
- */
|
|
- virObjectRef(args);
|
|
nsocks_listen++;
|
|
}
|
|
|
|
- /* Done with args in this function, drop reference */
|
|
- virObjectUnref(args);
|
|
-
|
|
if (!nsocks_listen)
|
|
goto error;
|
|
|
|
@@ -448,6 +438,8 @@ libxlDomainMigrationPrepare(virConnectPt
|
|
virObjectUnref(socks[i]);
|
|
}
|
|
VIR_FREE(socks);
|
|
+ virObjectUnref(args);
|
|
+
|
|
/* Remove virDomainObj from domain list */
|
|
if (vm) {
|
|
virDomainObjListRemove(driver->domains, vm);
|