379397c0f7
- Update to libvirt 1.2.18
- libxl: support dom0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped upstream patches:
e44bcae-virt-aa-helper-trailing-slash.patch,
a55a5e7-virt-aa-helper-log.patch,
61dab0f-virt-aa-helper-renaming.patch,
24f3c2f-virt-aa-helper-fix-caps.patch,
45697fe5-libxl-support-dom0.patch,
e9c27344-libxl-fix-virDomainObj-state.patch,
4ffb21c8-libxl-dom0-state-fix.patch,
qemu-nbd-cleanup-fix.patch
OBS-URL: https://build.opensuse.org/request/show/320420
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=475
109 lines
3.8 KiB
Diff
109 lines
3.8 KiB
Diff
From 68ccc0077c7f5af07ccf6992192bfc924d0fdd83 Mon Sep 17 00:00:00 2001
|
|
From: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Thu, 16 Jul 2015 14:51:30 -0600
|
|
Subject: 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>
|
|
---
|
|
src/libxl/libxl_migration.c | 18 +++++-------------
|
|
1 file changed, 5 insertions(+), 13 deletions(-)
|
|
|
|
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
|
|
@@ -112,11 +112,11 @@ libxlDoMigrateReceive(void *opaque)
|
|
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);
|
|
}
|
|
|
|
|
|
@@ -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);
|