- Devel - libvirt List Archives

[libvirt] [PATCH] admin: Distribute libvirt-admin.conf
by Martin Kletzander 01 Dec '15

01 Dec '15

Commit 48cd3dfa668e5033b02dd029c2e6de558a3c4583 introduced configuration file for libvirt-admin but forgot to distribute it. Also the change made to libvirt.conf in commit dbecb87f94e8f1591e3c471b34ae48a7203c9cb3 should've been removed thanks to introduction of separate config file. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 1 + src/Makefile.am | 2 +- src/libvirt.conf | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index bbd287b4d570..1f76f2406c5d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1569,6 +1569,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so rm -f $RPM_BUILD_ROOT%{_bindir}/virt-admin rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-admin.1* +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libvirt-admin.conf %if %{with_network} install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ diff --git a/src/Makefile.am b/src/Makefile.am index be3b3c84e863..7219f7c5635a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,7 +79,7 @@ moddir = $(libdir)/libvirt/connection-driver mod_LTLIBRARIES = confdir = $(sysconfdir)/libvirt -conf_DATA = libvirt.conf +conf_DATA = libvirt.conf libvirt-admin.conf augeasdir = $(datadir)/augeas/lenses augeas_DATA = diff --git a/src/libvirt.conf b/src/libvirt.conf index a6e16ae1534c..da4dfbecb187 100644 --- a/src/libvirt.conf +++ b/src/libvirt.conf @@ -16,4 +16,3 @@ # (@uri_default also prevents probing of the hypervisor driver). # #uri_default = "qemu:///system" -#uri_default_admin = "libvirtd:///system" -- 2.6.3

2 1

[libvirt] [PATCH] admin: Rename virAdmConnect to virAdmDaemon
by Martin Kletzander 01 Dec '15

01 Dec '15

virAdmConnect was named after virConnect, but after some discussions, most of the APIs called will be working with remote daemon and starting them virAdmDaemon will make more sense. Only possibly controversal name is CloseCallback (de)registration, and connecting to the daemon (which will still be Open/Close), but even this makes sense if one thinks about the daemon being opened and closed, e.g. as file, etc. This way all the APIs working with the daemon will start with virAdmDaemon prefix, they will accept virAdmDaemonPtr as first parameter and that will better suit with other namings as well (virDomain*, virAdmServer*, etc.). Because in virt-admin, the connection name does not refer to a struct that would have a connect in its name, also adjust 'connname' in clients. And because it is not used anywhere in the vsh code, move it from there into each client. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- daemon/admin_server.c | 22 ++--- include/libvirt/libvirt-admin.h | 48 +++++----- src/admin/admin_protocol.x | 10 +-- src/admin/admin_remote.c | 36 ++++---- src/admin_protocol-structs | 10 +-- src/datatypes.c | 38 ++++---- src/datatypes.h | 28 +++--- src/libvirt-admin.c | 195 ++++++++++++++++++++-------------------- src/libvirt_admin_private.syms | 4 +- src/libvirt_admin_public.syms | 16 ++-- src/rpc/gendispatch.pl | 2 +- tools/virsh.c | 18 ++-- tools/virsh.h | 1 + tools/virt-admin.c | 65 +++++++------- tools/virt-admin.h | 3 +- tools/vsh.h | 1 - 16 files changed, 248 insertions(+), 249 deletions(-) diff --git a/daemon/admin_server.c b/daemon/admin_server.c index 189091e75a15..678e8bcde852 100644 --- a/daemon/admin_server.c +++ b/daemon/admin_server.c @@ -79,11 +79,11 @@ remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED, /* Functions */ static int -adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - struct admin_connect_open_args *args) +adminDispatchDaemonOpen(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + struct admin_daemon_open_args *args) { unsigned int flags; struct daemonAdmClientPrivate *priv = @@ -105,18 +105,18 @@ adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -adminDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) +adminDispatchDaemonClose(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) { virNetServerClientDelayedClose(client); return 0; } static int -adminConnectGetLibVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, - unsigned long long *libVer) +adminDaemonGetVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, + unsigned long long *libVer) { if (libVer) *libVer = LIBVIR_VERSION_NUMBER; diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h index ab9df96b351f..b81698e63f36 100644 --- a/include/libvirt/libvirt-admin.h +++ b/include/libvirt/libvirt-admin.h @@ -35,53 +35,51 @@ extern "C" { # undef __VIR_ADMIN_H_INCLUDES__ /** - * virAdmConnect: + * virAdmDaemon: * - * a virAdmConnect is a private structure representing a connection to - * libvirt daemon. + * a virAdmDaemon is a private structure representing a remote daemon. */ -typedef struct _virAdmConnect virAdmConnect; +typedef struct _virAdmDaemon virAdmDaemon; /** - * virAdmConnectPtr: + * virAdmDaemonPtr: * - * a virAdmConnectPtr is pointer to a virAdmConnect private structure, - * this is the type used to reference a connection to the daemon - * in the API. + * a virAdmDaemonPtr is pointer to a virAdmDaemon private structure, + * this is the type used to reference a daemon in the API. */ -typedef virAdmConnect *virAdmConnectPtr; +typedef virAdmDaemon *virAdmDaemonPtr; -virAdmConnectPtr virAdmConnectOpen(const char *name, unsigned int flags); -int virAdmConnectClose(virAdmConnectPtr conn); +virAdmDaemonPtr virAdmDaemonOpen(const char *name, unsigned int flags); +int virAdmDaemonClose(virAdmDaemonPtr dmn); -int virAdmConnectRef(virAdmConnectPtr conn); -int virAdmConnectIsAlive(virAdmConnectPtr conn); +int virAdmDaemonRef(virAdmDaemonPtr dmn); +int virAdmDaemonIsAlive(virAdmDaemonPtr dmn); int virAdmGetVersion(unsigned long long *libVer); -char *virAdmConnectGetURI(virAdmConnectPtr conn); +char *virAdmDaemonGetURI(virAdmDaemonPtr dmn); -int virAdmConnectGetLibVersion(virAdmConnectPtr conn, - unsigned long long *libVer); +int virAdmDaemonGetVersion(virAdmDaemonPtr dmn, + unsigned long long *libVer); /** - * virAdmConnectCloseFunc: - * @conn: virAdmConnect connection + * virAdmDaemonCloseFunc: + * @dmn: virAdmDaemon connection * @reason: reason why the connection was closed (see virConnectCloseReason) * @opaque: opaque client data * * A callback to be registered, in case a connection was closed. */ -typedef void (*virAdmConnectCloseFunc)(virAdmConnectPtr conn, +typedef void (*virAdmDaemonCloseFunc)(virAdmDaemonPtr dmn, int reason, void *opaque); -int virAdmConnectRegisterCloseCallback(virAdmConnectPtr conn, - virAdmConnectCloseFunc cb, - void *opaque, - virFreeCallback freecb); -int virAdmConnectUnregisterCloseCallback(virAdmConnectPtr conn, - virAdmConnectCloseFunc cb); +int virAdmDaemonRegisterCloseCallback(virAdmDaemonPtr dmn, + virAdmDaemonCloseFunc cb, + void *opaque, + virFreeCallback freecb); +int virAdmDaemonUnregisterCloseCallback(virAdmDaemonPtr dmn, + virAdmDaemonCloseFunc cb); # ifdef __cplusplus } diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x index 878983d2ec74..b168f6fffda7 100644 --- a/src/admin/admin_protocol.x +++ b/src/admin/admin_protocol.x @@ -37,11 +37,11 @@ typedef string admin_nonnull_string<ADMIN_STRING_MAX>; typedef admin_nonnull_string *admin_string; /*----- Protocol. -----*/ -struct admin_connect_open_args { +struct admin_daemon_open_args { unsigned int flags; }; -struct admin_connect_get_lib_version_ret { +struct admin_daemon_get_version_ret { unsigned hyper libVer; }; @@ -70,15 +70,15 @@ enum admin_procedure { /** * @generate: none */ - ADMIN_PROC_CONNECT_OPEN = 1, + ADMIN_PROC_DAEMON_OPEN = 1, /** * @generate: none */ - ADMIN_PROC_CONNECT_CLOSE = 2, + ADMIN_PROC_DAEMON_CLOSE = 2, /** * @generate: both */ - ADMIN_PROC_CONNECT_GET_LIB_VERSION = 3 + ADMIN_PROC_DAEMON_GET_VERSION = 3 }; diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 7b40ea16e120..8073b0827a51 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -48,7 +48,7 @@ remoteAdminPrivDispose(void *opaque) static int -callFull(virAdmConnectPtr conn ATTRIBUTE_UNUSED, +callFull(virAdmDaemonPtr dmn ATTRIBUTE_UNUSED, remoteAdminPrivPtr priv, int *fdin, size_t fdinlen, @@ -86,7 +86,7 @@ callFull(virAdmConnectPtr conn ATTRIBUTE_UNUSED, } static int -call(virAdmConnectPtr conn, +call(virAdmDaemonPtr dmn, unsigned int flags, int proc_nr, xdrproc_t args_filter, char *args, @@ -94,7 +94,7 @@ call(virAdmConnectPtr conn, { virCheckFlags(0, -1); - return callFull(conn, conn->privateData, + return callFull(dmn, dmn->privateData, NULL, 0, NULL, NULL, proc_nr, args_filter, args, ret_filter, ret); } @@ -106,14 +106,14 @@ remoteAdminClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, int reason, void *opaque) { - virAdmConnectCloseCallbackDataPtr cbdata = opaque; + virAdmDaemonCloseCallbackDataPtr cbdata = opaque; virObjectLock(cbdata); if (cbdata->callback) { VIR_DEBUG("Triggering connection close callback %p reason=%d, opaque=%p", cbdata->callback, reason, cbdata->opaque); - cbdata->callback(cbdata->conn, reason, cbdata->opaque); + cbdata->callback(cbdata->dmn, reason, cbdata->opaque); if (cbdata->freeCallback) cbdata->freeCallback(cbdata->opaque); @@ -124,11 +124,11 @@ remoteAdminClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, } static int -remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) +remoteAdminDaemonOpen(virAdmDaemonPtr dmn, unsigned int flags) { int rv = -1; - remoteAdminPrivPtr priv = conn->privateData; - admin_connect_open_args args; + remoteAdminPrivPtr priv = dmn->privateData; + admin_daemon_open_args args; virObjectLock(priv); @@ -140,13 +140,13 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) virResetLastError(); } - virObjectRef(conn->closeCallback); + virObjectRef(dmn->closeCallback); virNetClientSetCloseCallback(priv->client, remoteAdminClientCloseFunc, - conn->closeCallback, + dmn->closeCallback, virObjectFreeCallback); - if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, - (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, + if (call(dmn, 0, ADMIN_PROC_DAEMON_OPEN, + (xdrproc_t)xdr_admin_daemon_open_args, (char *)&args, (xdrproc_t)xdr_void, (char *)NULL) == -1) { goto done; } @@ -159,14 +159,14 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) } static int -remoteAdminConnectClose(virAdmConnectPtr conn) +remoteAdminDaemonClose(virAdmDaemonPtr dmn) { int rv = -1; - remoteAdminPrivPtr priv = conn->privateData; + remoteAdminPrivPtr priv = dmn->privateData; virObjectLock(priv); - if (call(conn, 0, ADMIN_PROC_CONNECT_CLOSE, + if (call(dmn, 0, ADMIN_PROC_DAEMON_CLOSE, (xdrproc_t)xdr_void, (char *)NULL, (xdrproc_t)xdr_void, (char *)NULL) == -1) { goto done; @@ -184,10 +184,10 @@ remoteAdminConnectClose(virAdmConnectPtr conn) static void remoteAdminPrivFree(void *opaque) { - virAdmConnectPtr conn = opaque; + virAdmDaemonPtr dmn = opaque; - remoteAdminConnectClose(conn); - virObjectUnref(conn->privateData); + remoteAdminDaemonClose(dmn); + virObjectUnref(dmn->privateData); } static remoteAdminPrivPtr diff --git a/src/admin_protocol-structs b/src/admin_protocol-structs index 809379be3498..1753f54d36f5 100644 --- a/src/admin_protocol-structs +++ b/src/admin_protocol-structs @@ -1,12 +1,12 @@ /* -*- c -*- */ -struct admin_connect_open_args { +struct admin_daemon_open_args { u_int flags; }; -struct admin_connect_get_lib_version_ret { +struct admin_daemon_get_version_ret { uint64_t libVer; }; enum admin_procedure { - ADMIN_PROC_CONNECT_OPEN = 1, - ADMIN_PROC_CONNECT_CLOSE = 2, - ADMIN_PROC_CONNECT_GET_LIB_VERSION = 3, + ADMIN_PROC_DAEMON_OPEN = 1, + ADMIN_PROC_DAEMON_CLOSE = 2, + ADMIN_PROC_DAEMON_GET_VERSION = 3, }; diff --git a/src/datatypes.c b/src/datatypes.c index c832d805859f..dc592b68d7cf 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -59,11 +59,11 @@ static void virStreamDispose(void *obj); static void virStorageVolDispose(void *obj); static void virStoragePoolDispose(void *obj); -virClassPtr virAdmConnectClass; -virClassPtr virAdmConnectCloseCallbackDataClass; +virClassPtr virAdmDaemonClass; +virClassPtr virAdmDaemonCloseCallbackDataClass; -static void virAdmConnectDispose(void *obj); -static void virAdmConnectCloseCallbackDataDispose(void *obj); +static void virAdmDaemonDispose(void *obj); +static void virAdmDaemonCloseCallbackDataDispose(void *obj); static int virDataTypesOnceInit(void) @@ -92,8 +92,8 @@ virDataTypesOnceInit(void) DECLARE_CLASS(virStorageVol); DECLARE_CLASS(virStoragePool); - DECLARE_CLASS_LOCKABLE(virAdmConnect); - DECLARE_CLASS_LOCKABLE(virAdmConnectCloseCallbackData); + DECLARE_CLASS_LOCKABLE(virAdmDaemon); + DECLARE_CLASS_LOCKABLE(virAdmDaemonCloseCallbackData); #undef DECLARE_CLASS_COMMON #undef DECLARE_CLASS_LOCKABLE @@ -814,18 +814,18 @@ virDomainSnapshotDispose(void *obj) } -virAdmConnectPtr -virAdmConnectNew(void) +virAdmDaemonPtr +virAdmDaemonNew(void) { - virAdmConnectPtr ret; + virAdmDaemonPtr ret; if (virDataTypesInitialize() < 0) return NULL; - if (!(ret = virObjectLockableNew(virAdmConnectClass))) + if (!(ret = virObjectLockableNew(virAdmDaemonClass))) return NULL; - if (!(ret->closeCallback = virObjectLockableNew(virAdmConnectCloseCallbackDataClass))) + if (!(ret->closeCallback = virObjectLockableNew(virAdmDaemonCloseCallbackDataClass))) goto error; return ret; @@ -836,21 +836,21 @@ virAdmConnectNew(void) } static void -virAdmConnectDispose(void *obj) +virAdmDaemonDispose(void *obj) { - virAdmConnectPtr conn = obj; + virAdmDaemonPtr dmn = obj; - if (conn->privateDataFreeFunc) - conn->privateDataFreeFunc(conn); + if (dmn->privateDataFreeFunc) + dmn->privateDataFreeFunc(dmn); - virURIFree(conn->uri); - virObjectUnref(conn->closeCallback); + virURIFree(dmn->uri); + virObjectUnref(dmn->closeCallback); } static void -virAdmConnectCloseCallbackDataDispose(void *obj) +virAdmDaemonCloseCallbackDataDispose(void *obj) { - virAdmConnectCloseCallbackDataPtr cb_data = obj; + virAdmDaemonCloseCallbackDataPtr cb_data = obj; virObjectLock(cb_data); diff --git a/src/datatypes.h b/src/datatypes.h index 1b1777daa885..0402f09d5736 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -41,7 +41,7 @@ extern virClassPtr virStreamClass; extern virClassPtr virStorageVolClass; extern virClassPtr virStoragePoolClass; -extern virClassPtr virAdmConnectClass; +extern virClassPtr virAdmDaemonClass; # define virCheckConnectReturn(obj, retval) \ do { \ @@ -297,9 +297,9 @@ extern virClassPtr virAdmConnectClass; dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ } while (0) -# define virCheckAdmConnectReturn(obj, retval) \ +# define virCheckAdmDaemonReturn(obj, retval) \ do { \ - if (!virObjectIsClass(obj, virAdmConnectClass)) { \ + if (!virObjectIsClass(obj, virAdmDaemonClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ __FILE__, __FUNCTION__, __LINE__, \ __FUNCTION__); \ @@ -307,9 +307,9 @@ extern virClassPtr virAdmConnectClass; return retval; \ } \ } while (0) -# define virCheckAdmConnectGoto(obj, label) \ +# define virCheckAdmDaemonGoto(obj, label) \ do { \ - if (!virObjectIsClass(obj, virAdmConnectClass)) { \ + if (!virObjectIsClass(obj, virAdmDaemonClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ __FILE__, __FUNCTION__, __LINE__, \ __FUNCTION__); \ @@ -331,8 +331,8 @@ extern virClassPtr virAdmConnectClass; typedef struct _virConnectCloseCallbackData virConnectCloseCallbackData; typedef virConnectCloseCallbackData *virConnectCloseCallbackDataPtr; -typedef struct _virAdmConnectCloseCallbackData virAdmConnectCloseCallbackData; -typedef virAdmConnectCloseCallbackData *virAdmConnectCloseCallbackDataPtr; +typedef struct _virAdmDaemonCloseCallbackData virAdmDaemonCloseCallbackData; +typedef virAdmDaemonCloseCallbackData *virAdmDaemonCloseCallbackDataPtr; /** * Internal structures holding data related to connection close callbacks. @@ -346,11 +346,11 @@ struct _virConnectCloseCallbackData { virFreeCallback freeCallback; }; -struct _virAdmConnectCloseCallbackData { +struct _virAdmDaemonCloseCallbackData { virObjectLockable parent; - virAdmConnectPtr conn; - virAdmConnectCloseFunc callback; + virAdmDaemonPtr dmn; + virAdmDaemonCloseFunc callback; void *opaque; virFreeCallback freeCallback; }; @@ -402,11 +402,11 @@ struct _virConnect { }; /** - * _virAdmConnect: + * _virAdmDaemon: * * Internal structure associated to an admin connection */ -struct _virAdmConnect { +struct _virAdmDaemon { virObjectLockable object; virURIPtr uri; @@ -414,7 +414,7 @@ struct _virAdmConnect { virFreeCallback privateDataFreeFunc; /* Per-connection close callback */ - virAdmConnectCloseCallbackDataPtr closeCallback; + virAdmDaemonCloseCallbackDataPtr closeCallback; }; @@ -599,6 +599,6 @@ virNWFilterPtr virGetNWFilter(virConnectPtr conn, virDomainSnapshotPtr virGetDomainSnapshot(virDomainPtr domain, const char *name); -virAdmConnectPtr virAdmConnectNew(void); +virAdmDaemonPtr virAdmDaemonNew(void); #endif /* __VIR_DATATYPES_H__ */ diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 6e6da81b3f5d..7b767bdebd4c 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -53,7 +53,7 @@ virAdmGlobalInit(void) { /* It would be nice if we could trace the use of this call, to * help diagnose in log files if a user calls something other than - * virAdmConnectOpen first. But we can't rely on VIR_DEBUG working + * virAdmDaemonOpen first. But we can't rely on VIR_DEBUG working * until after initialization is complete, and since this is * one-shot, we never get here again. */ if (virThreadInitialize() < 0 || @@ -183,20 +183,20 @@ virAdmGetDefaultURI(virConfPtr conf) } /** - * virAdmConnectOpen: + * virAdmDaemonOpen: * @name: uri of the daemon to connect to, NULL for default * @flags: unused, must be 0 * * Opens connection to admin interface of the daemon. * - * Returns @virAdmConnectPtr object or NULL on error + * Returns @virAdmDaemonPtr object or NULL on error */ -virAdmConnectPtr -virAdmConnectOpen(const char *name, unsigned int flags) +virAdmDaemonPtr +virAdmDaemonOpen(const char *name, unsigned int flags) { char *sock_path = NULL; char *alias = NULL; - virAdmConnectPtr conn = NULL; + virAdmDaemonPtr dmn = NULL; virConfPtr conf = NULL; if (virAdmInitialize() < 0) @@ -206,7 +206,7 @@ virAdmConnectOpen(const char *name, unsigned int flags) virResetLastError(); virCheckFlags(VIR_CONNECT_NO_ALIASES, NULL); - if (!(conn = virAdmConnectNew())) + if (!(dmn = virAdmDaemonNew())) goto error; if (virConfLoadConfig(&conf, "libvirt-admin.conf") < 0) @@ -219,46 +219,46 @@ virAdmConnectOpen(const char *name, unsigned int flags) virURIResolveAlias(conf, name, &alias) < 0)) goto error; - if (!(conn->uri = virURIParse(alias ? alias : name))) + if (!(dmn->uri = virURIParse(alias ? alias : name))) goto error; - if (!(sock_path = getSocketPath(conn->uri))) + if (!(sock_path = getSocketPath(dmn->uri))) goto error; - if (!(conn->privateData = remoteAdminPrivNew(sock_path))) + if (!(dmn->privateData = remoteAdminPrivNew(sock_path))) goto error; - conn->privateDataFreeFunc = remoteAdminPrivFree; + dmn->privateDataFreeFunc = remoteAdminPrivFree; - if (remoteAdminConnectOpen(conn, flags) < 0) + if (remoteAdminDaemonOpen(dmn, flags) < 0) goto error; cleanup: VIR_FREE(sock_path); VIR_FREE(alias); virConfFree(conf); - return conn; + return dmn; error: virDispatchError(NULL); - virObjectUnref(conn); - conn = NULL; + virObjectUnref(dmn); + dmn = NULL; goto cleanup; } /** - * virAdmConnectClose: - * @conn: pointer to admin connection to close + * virAdmDaemonClose: + * @dmn: pointer to admin connection to close * * This function closes the admin connection to the Hypervisor. This should not * be called if further interaction with the Hypervisor are needed especially if * there is running domain which need further monitoring by the application. * * Connections are reference counted; the count is explicitly increased by the - * initial virAdmConnectOpen, as well as virAdmConnectRef; it is also temporarily + * initial virAdmDaemonOpen, as well as virAdmDaemonRef; it is also temporarily * increased by other API that depend on the connection remaining alive. The - * open and every virAdmConnectRef call should have a matching - * virAdmConnectClose, and all other references will be released after the + * open and every virAdmDaemonRef call should have a matching + * virAdmDaemonClose, and all other references will be released after the * corresponding operation completes. * * Returns a positive number if at least 1 reference remains on success. The @@ -266,34 +266,34 @@ virAdmConnectOpen(const char *name, unsigned int flags) * return of 0 implies no references remain and the connection is closed and * memory has been freed. A return of -1 implies a failure. * - * It is possible for the last virAdmConnectClose to return a positive value if + * It is possible for the last virAdmDaemonClose to return a positive value if * some other object still has a temporary reference to the connection, but the * application should not try to further use a connection after the - * virAdmConnectClose that matches the initial open. + * virAdmDaemonClose that matches the initial open. */ int -virAdmConnectClose(virAdmConnectPtr conn) +virAdmDaemonClose(virAdmDaemonPtr dmn) { - VIR_DEBUG("conn=%p", conn); + VIR_DEBUG("dmn=%p", dmn); virResetLastError(); - if (!conn) + if (!dmn) return 0; - virCheckAdmConnectReturn(conn, -1); + virCheckAdmDaemonReturn(dmn, -1); - if (!virObjectUnref(conn)) + if (!virObjectUnref(dmn)) return 0; return 1; } /** - * virAdmConnectRef: - * @conn: the connection to hold a reference on + * virAdmDaemonRef: + * @dmn: the connection to hold a reference on * * Increment the reference count on the connection. For each additional call to - * this method, there shall be a corresponding call to virAdmConnectClose to + * this method, there shall be a corresponding call to virAdmDaemonClose to * release the reference count, once the caller no longer needs the reference to * this object. * @@ -305,15 +305,15 @@ virAdmConnectClose(virAdmConnectPtr conn) * Returns 0 in case of success, -1 in case of failure */ int -virAdmConnectRef(virAdmConnectPtr conn) +virAdmDaemonRef(virAdmDaemonPtr dmn) { - VIR_DEBUG("conn=%p refs=%d", conn, - conn ? conn->object.parent.u.s.refs : 0); + VIR_DEBUG("dmn=%p refs=%d", dmn, + dmn ? dmn->object.parent.u.s.refs : 0); virResetLastError(); - virCheckAdmConnectReturn(conn, -1); + virCheckAdmDaemonReturn(dmn, -1); - virObjectRef(conn); + virObjectRef(dmn); return 0; } @@ -327,8 +327,7 @@ virAdmConnectRef(virAdmConnectPtr conn) * generic message will be returned. @libVer format is as follows: * major * 1,000,000 + minor * 1,000 + release. * - * NOTE: To get the remote side library version use virAdmConnectGetLibVersion - * instead. + * NOTE: To get the remote side version use virAdmDaemonGetVersion instead. * * Returns 0 on success, -1 in case of an error. */ @@ -353,8 +352,8 @@ virAdmGetVersion(unsigned long long *libVer) } /** - * virAdmConnectIsAlive: - * @conn: connection to admin server + * virAdmDaemonIsAlive: + * @dmn: connection to admin server * * Decide whether the connection to the admin server is alive or not. * Connection is considered alive if the channel it is running over is not @@ -364,20 +363,20 @@ virAdmGetVersion(unsigned long long *libVer) * connection at all or the channel has already been closed, or -1 on error. */ int -virAdmConnectIsAlive(virAdmConnectPtr conn) +virAdmDaemonIsAlive(virAdmDaemonPtr dmn) { bool ret; remoteAdminPrivPtr priv = NULL; - VIR_DEBUG("conn=%p", conn); + VIR_DEBUG("dmn=%p", dmn); - if (!conn) + if (!dmn) return 0; - virCheckAdmConnectReturn(conn, -1); + virCheckAdmDaemonReturn(dmn, -1); virResetLastError(); - priv = conn->privateData; + priv = dmn->privateData; virObjectLock(priv); ret = virNetClientIsOpen(priv->client); virObjectUnlock(priv); @@ -386,35 +385,35 @@ virAdmConnectIsAlive(virAdmConnectPtr conn) } /** - * virAdmConnectGetURI: - * @conn: pointer to an admin connection + * virAdmDaemonGetURI: + * @dmn: pointer to an admin connection * * String returned by this method is normally the same as the string passed - * to the virAdmConnectOpen. Even if NULL was passed to virAdmConnectOpen, + * to the virAdmDaemonOpen. Even if NULL was passed to virAdmDaemonOpen, * this method returns a non-null URI string. * * Returns an URI string related to the connection or NULL in case of an error. * Caller is responsible for freeing the string. */ char * -virAdmConnectGetURI(virAdmConnectPtr conn) +virAdmDaemonGetURI(virAdmDaemonPtr dmn) { char *uri = NULL; - VIR_DEBUG("conn=%p", conn); + VIR_DEBUG("dmn=%p", dmn); virResetLastError(); - virCheckAdmConnectReturn(conn, NULL); + virCheckAdmDaemonReturn(dmn, NULL); - if (!(uri = virURIFormat(conn->uri))) + if (!(uri = virURIFormat(dmn->uri))) virDispatchError(NULL); return uri; } /** - * virAdmConnectRegisterCloseCallback: - * @conn: connection to admin server + * virAdmDaemonRegisterCloseCallback: + * @dmn: connection to admin server * @cb: callback to be invoked upon connection close * @opaque: user data to pass to @cb * @freecb: callback to free @opaque @@ -430,103 +429,103 @@ virAdmConnectGetURI(virAdmConnectPtr conn) * * Returns 0 on success, -1 on error */ -int virAdmConnectRegisterCloseCallback(virAdmConnectPtr conn, - virAdmConnectCloseFunc cb, - void *opaque, - virFreeCallback freecb) +int virAdmDaemonRegisterCloseCallback(virAdmDaemonPtr dmn, + virAdmDaemonCloseFunc cb, + void *opaque, + virFreeCallback freecb) { - VIR_DEBUG("conn=%p", conn); + VIR_DEBUG("dmn=%p", dmn); virResetLastError(); - virCheckAdmConnectReturn(conn, -1); + virCheckAdmDaemonReturn(dmn, -1); - virObjectRef(conn); + virObjectRef(dmn); - virObjectLock(conn); - virObjectLock(conn->closeCallback); + virObjectLock(dmn); + virObjectLock(dmn->closeCallback); virCheckNonNullArgGoto(cb, error); - if (conn->closeCallback->callback) { + if (dmn->closeCallback->callback) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A close callback is already registered")); goto error; } - conn->closeCallback->conn = conn; - conn->closeCallback->callback = cb; - conn->closeCallback->opaque = opaque; - conn->closeCallback->freeCallback = freecb; + dmn->closeCallback->dmn = dmn; + dmn->closeCallback->callback = cb; + dmn->closeCallback->opaque = opaque; + dmn->closeCallback->freeCallback = freecb; - virObjectUnlock(conn->closeCallback); - virObjectUnlock(conn); + virObjectUnlock(dmn->closeCallback); + virObjectUnlock(dmn); return 0; error: - virObjectUnlock(conn->closeCallback); - virObjectUnlock(conn); + virObjectUnlock(dmn->closeCallback); + virObjectUnlock(dmn); virDispatchError(NULL); - virObjectUnref(conn); + virObjectUnref(dmn); return -1; } /** - * virAdmConnectUnregisterCloseCallback: - * @conn: pointer to connection object + * virAdmDaemonUnregisterCloseCallback: + * @dmn: pointer to connection object * @cb: pointer to the current registered callback * * Unregisters the callback previously set with the - * virAdmConnectRegisterCloseCallback method. The callback + * virAdmDaemonRegisterCloseCallback method. The callback * will no longer receive notifications when the connection * closes. If a virFreeCallback was provided at time of * registration, it will be invoked. * * Returns 0 on success, -1 on error */ -int virAdmConnectUnregisterCloseCallback(virAdmConnectPtr conn, - virAdmConnectCloseFunc cb) +int virAdmDaemonUnregisterCloseCallback(virAdmDaemonPtr dmn, + virAdmDaemonCloseFunc cb) { - VIR_DEBUG("conn=%p", conn); + VIR_DEBUG("dmn=%p", dmn); virResetLastError(); - virCheckAdmConnectReturn(conn, -1); + virCheckAdmDaemonReturn(dmn, -1); - virObjectLock(conn); - virObjectLock(conn->closeCallback); + virObjectLock(dmn); + virObjectLock(dmn->closeCallback); virCheckNonNullArgGoto(cb, error); - if (conn->closeCallback->callback != cb) { + if (dmn->closeCallback->callback != cb) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A different callback was requested")); goto error; } - conn->closeCallback->callback = NULL; - if (conn->closeCallback->freeCallback) - conn->closeCallback->freeCallback(conn->closeCallback->opaque); - conn->closeCallback->freeCallback = NULL; + dmn->closeCallback->callback = NULL; + if (dmn->closeCallback->freeCallback) + dmn->closeCallback->freeCallback(dmn->closeCallback->opaque); + dmn->closeCallback->freeCallback = NULL; - virObjectUnlock(conn->closeCallback); - virObjectUnlock(conn); - virObjectUnref(conn); + virObjectUnlock(dmn->closeCallback); + virObjectUnlock(dmn); + virObjectUnref(dmn); return 0; error: - virObjectUnlock(conn->closeCallback); - virObjectUnlock(conn); + virObjectUnlock(dmn->closeCallback); + virObjectUnlock(dmn); virDispatchError(NULL); return -1; } /** - * virAdmConnectGetLibVersion: - * @conn: pointer to an active admin connection + * virAdmDaemonGetVersion: + * @dmn: pointer to an active admin connection * @libVer: stores the current remote libvirt version number * * Retrieves the remote side libvirt version used by the daemon. Format @@ -535,17 +534,17 @@ int virAdmConnectUnregisterCloseCallback(virAdmConnectPtr conn, * * Returns 0 on success, -1 on failure and @libVer follows this format: */ -int virAdmConnectGetLibVersion(virAdmConnectPtr conn, - unsigned long long *libVer) +int virAdmDaemonGetVersion(virAdmDaemonPtr dmn, + unsigned long long *libVer) { - VIR_DEBUG("conn=%p, libVir=%p", conn, libVer); + VIR_DEBUG("dmn=%p, libVir=%p", dmn, libVer); virResetLastError(); - virCheckAdmConnectReturn(conn, -1); + virCheckAdmDaemonReturn(dmn, -1); virCheckNonNullArgReturn(libVer, -1); - if (remoteAdminConnectGetLibVersion(conn, libVer) < 0) + if (remoteAdminDaemonGetVersion(dmn, libVer) < 0) goto error; return 0; diff --git a/src/libvirt_admin_private.syms b/src/libvirt_admin_private.syms index 85380dcb2fc5..3dc06a0a8763 100644 --- a/src/libvirt_admin_private.syms +++ b/src/libvirt_admin_private.syms @@ -6,8 +6,8 @@ # # admin/admin_protocol.x -xdr_admin_connect_get_lib_version_ret; -xdr_admin_connect_open_args; +xdr_admin_daemon_get_version_ret; +xdr_admin_daemon_open_args; # Let emacs know we want case-insensitive sorting # Local Variables: diff --git a/src/libvirt_admin_public.syms b/src/libvirt_admin_public.syms index 33b1db45a31d..75ff8a8c1d4a 100644 --- a/src/libvirt_admin_public.syms +++ b/src/libvirt_admin_public.syms @@ -12,13 +12,13 @@ # LIBVIRT_ADMIN_1.3.0 { global: - virAdmConnectOpen; - virAdmConnectClose; - virAdmConnectRef; + virAdmDaemonClose; + virAdmDaemonGetURI; + virAdmDaemonGetVersion; + virAdmDaemonIsAlive; + virAdmDaemonOpen; + virAdmDaemonRef; + virAdmDaemonRegisterCloseCallback; + virAdmDaemonUnregisterCloseCallback; virAdmGetVersion; - virAdmConnectIsAlive; - virAdmConnectGetURI; - virAdmConnectGetLibVersion; - virAdmConnectRegisterCloseCallback; - virAdmConnectUnregisterCloseCallback; }; diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 5cfc5120b209..eb45465e1e75 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -49,7 +49,7 @@ my $procprefix = shift or die "missing procedure prefix argument"; my $protocol = shift or die "missing protocol argument"; my @autogen; -my $connect_ptr = $structprefix eq "admin" ? "virAdmConnectPtr" : "virConnectPtr"; +my $connect_ptr = $structprefix eq "admin" ? "virAdmDaemonPtr" : "virConnectPtr"; my $prefix = ($structprefix eq "admin") ? "admin" : "vir"; sub fixup_name { diff --git a/tools/virsh.c b/tools/virsh.c index 7484bed8ebd5..96316bfb9140 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -198,7 +198,7 @@ virshReconnect(vshControl *ctl) "disconnect from the hypervisor")); } - priv->conn = virshConnect(ctl, ctl->connname, priv->readonly); + priv->conn = virshConnect(ctl, priv->connname, priv->readonly); if (!priv->conn) { if (disconnected) @@ -275,18 +275,18 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) priv->conn = NULL; } - VIR_FREE(ctl->connname); + VIR_FREE(priv->connname); if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - ctl->connname = vshStrdup(ctl, name); + priv->connname = vshStrdup(ctl, name); priv->useGetInfo = false; priv->useSnapshotOld = false; priv->blockJobNoBytes = false; priv->readonly = ro; - priv->conn = virshConnect(ctl, ctl->connname, priv->readonly); + priv->conn = virshConnect(ctl, priv->connname, priv->readonly); if (!priv->conn) { vshError(ctl, "%s", _("Failed to connect to the hypervisor")); @@ -398,7 +398,7 @@ virshInit(vshControl *ctl) NULL)) < 0) return false; - if (ctl->connname) { + if (priv->connname) { virshReconnect(ctl); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it @@ -430,7 +430,7 @@ virshDeinit(vshControl *ctl) virshControlPtr priv = ctl->privData; vshDeinit(ctl); - VIR_FREE(ctl->connname); + VIR_FREE(priv->connname); if (priv->conn) { int ret; virConnectUnregisterCloseCallback(priv->conn, virshCatchDisconnect); @@ -706,8 +706,8 @@ virshParseArgv(vshControl *ctl, int argc, char **argv) while ((arg = getopt_long(argc, argv, "+:c:d:e:hk:K:l:qrtvV", opt, &longindex)) != -1) { switch (arg) { case 'c': - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, optarg); + VIR_FREE(priv->connname); + priv->connname = vshStrdup(ctl, optarg); break; case 'd': if (virStrToLong_i(optarg, NULL, 10, &debug) < 0) { @@ -934,7 +934,7 @@ main(int argc, char **argv) virFileActivateDirOverride(argv[0]); if ((defaultConn = virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI"))) - ctl->connname = vshStrdup(ctl, defaultConn); + virshCtl.connname = vshStrdup(ctl, defaultConn); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virsh.h b/tools/virsh.h index 3402408e8992..1845b0e52d34 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -69,6 +69,7 @@ typedef struct _virshCtrlData virshCtrlData; */ struct _virshControl { virConnectPtr conn; /* connection to hypervisor (MAY BE NULL) */ + char *connname; /* connection name */ bool readonly; /* connect readonly (first time only, not * during explicit connect command) */ diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 137296357d25..3b5efab9cf04 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -56,11 +56,11 @@ static const vshClientHooks hooks; * vshAdmCatchDisconnect: * * We get here when the connection was closed. Unlike virsh, we do not save - * the fact that the event was raised, sice there is virAdmConnectIsAlive to + * the fact that the event was raised, sice there is virAdmDaemonIsAlive to * check if the communication channel has not been closed by remote party. */ static void -vshAdmCatchDisconnect(virAdmConnectPtr conn ATTRIBUTE_UNUSED, +vshAdmCatchDisconnect(virAdmDaemonPtr dmn ATTRIBUTE_UNUSED, int reason, void *opaque) { @@ -73,7 +73,7 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn ATTRIBUTE_UNUSED, return; error = virSaveLastError(); - uri = virAdmConnectGetURI(conn); + uri = virAdmDaemonGetURI(dmn); switch ((virConnectCloseReason) reason) { case VIR_CONNECT_CLOSE_REASON_ERROR: @@ -100,21 +100,21 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn ATTRIBUTE_UNUSED, } static int -vshAdmConnect(vshControl *ctl, unsigned int flags) +vshAdmDaemon(vshControl *ctl, unsigned int flags) { vshAdmControlPtr priv = ctl->privData; - priv->conn = virAdmConnectOpen(ctl->connname, flags); + priv->dmn = virAdmDaemonOpen(priv->name, flags); - if (!priv->conn) { + if (!priv->dmn) { if (priv->wantReconnect) vshError(ctl, "%s", _("Failed to reconnect to the admin server")); else vshError(ctl, "%s", _("Failed to connect to the admin server")); return -1; } else { - if (virAdmConnectRegisterCloseCallback(priv->conn, vshAdmCatchDisconnect, - NULL, NULL) < 0) + if (virAdmDaemonRegisterCloseCallback(priv->dmn, vshAdmCatchDisconnect, + NULL, NULL) < 0) vshError(ctl, "%s", _("Unable to register disconnect callback")); if (priv->wantReconnect) @@ -132,17 +132,17 @@ vshAdmDisconnect(vshControl *ctl) int ret = 0; vshAdmControlPtr priv = ctl->privData; - if (!priv->conn) + if (!priv->dmn) return ret; - virAdmConnectUnregisterCloseCallback(priv->conn, vshAdmCatchDisconnect); - ret = virAdmConnectClose(priv->conn); + virAdmDaemonUnregisterCloseCallback(priv->dmn, vshAdmCatchDisconnect); + ret = virAdmDaemonClose(priv->dmn); if (ret < 0) vshError(ctl, "%s", _("Failed to disconnect from the admin server")); else if (ret > 0) vshError(ctl, "%s", _("One or more references were leaked after " "disconnect from the hypervisor")); - priv->conn = NULL; + priv->dmn = NULL; return ret; } @@ -156,11 +156,11 @@ static void vshAdmReconnect(vshControl *ctl) { vshAdmControlPtr priv = ctl->privData; - if (priv->conn) + if (priv->dmn) priv->wantReconnect = true; vshAdmDisconnect(ctl); - vshAdmConnect(ctl, 0); + vshAdmDaemon(ctl, 0); priv->wantReconnect = false; } @@ -185,7 +185,7 @@ cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) char *uri; vshAdmControlPtr priv = ctl->privData; - uri = virAdmConnectGetURI(priv->conn); + uri = virAdmDaemonGetURI(priv->dmn); if (!uri) { vshError(ctl, "%s", _("failed to get URI")); return false; @@ -243,7 +243,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, _("Using library: libvirt %d.%d.%d\n"), major, minor, rel); - ret = virAdmConnectGetLibVersion(priv->conn, &daemonVersion); + ret = virAdmDaemonGetVersion(priv->dmn, &daemonVersion); if (ret < 0) { vshError(ctl, "%s", _("failed to get the daemon version")); } else { @@ -292,28 +292,28 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, name); + VIR_FREE(priv->name); + priv->name = vshStrdup(ctl, name); vshAdmReconnect(ctl); - return !!priv->conn; + return !!priv->dmn; } static void * -vshAdmConnectionHandler(vshControl *ctl) +vshAdmDaemonionHandler(vshControl *ctl) { vshAdmControlPtr priv = ctl->privData; - if (!virAdmConnectIsAlive(priv->conn)) + if (!virAdmDaemonIsAlive(priv->dmn)) vshAdmReconnect(ctl); - if (!virAdmConnectIsAlive(priv->conn)) { + if (!virAdmDaemonIsAlive(priv->dmn)) { vshError(ctl, "%s", _("no valid connection")); return NULL; } - return priv->conn; + return priv->dmn; } /* @@ -329,7 +329,7 @@ vshAdmInit(vshControl *ctl) * work properly */ vshInitReload(ctl); - if (priv->conn) + if (priv->dmn) return false; /* set up the library error handler */ @@ -342,7 +342,7 @@ vshAdmInit(vshControl *ctl) return false; ctl->eventLoopStarted = true; - if (ctl->connname) { + if (priv->name) { vshAdmReconnect(ctl); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it @@ -350,7 +350,7 @@ vshAdmInit(vshControl *ctl) * non-default connection, or might be 'help' which needs no * connection). */ - if (!priv->conn) { + if (!priv->dmn) { vshReportError(ctl); return false; } @@ -374,9 +374,9 @@ vshAdmDeinit(vshControl *ctl) vshAdmControlPtr priv = ctl->privData; vshDeinit(ctl); - VIR_FREE(ctl->connname); + VIR_FREE(priv->name); - if (priv->conn) + if (priv->dmn) vshAdmDisconnect(ctl); virResetLastError(); @@ -473,6 +473,7 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **argv) int arg, debug; size_t i; int longindex = -1; + vshAdmControlPtr priv = ctl->privData; struct option opt[] = { {"connect", required_argument, NULL, 'c'}, {"debug", required_argument, NULL, 'd'}, @@ -489,8 +490,8 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **argv) while ((arg = getopt_long(argc, argv, "+:c:d:hl:qvV", opt, &longindex)) != -1) { switch (arg) { case 'c': - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, optarg); + VIR_FREE(priv->name); + priv->name = vshStrdup(ctl, optarg); break; case 'd': if (virStrToLong_i(optarg, NULL, 10, &debug) < 0) { @@ -598,7 +599,7 @@ static const vshCmdGrp cmdGroups[] = { }; static const vshClientHooks hooks = { - .connHandler = vshAdmConnectionHandler + .connHandler = vshAdmDaemonionHandler }; int @@ -656,7 +657,7 @@ main(int argc, char **argv) virFileActivateDirOverride(argv[0]); if ((defaultConn = virGetEnvBlockSUID("LIBVIRT_DEFAULT_ADMIN_URI"))) - ctl->connname = vshStrdup(ctl, defaultConn); + virtAdminCtl.name = vshStrdup(ctl, defaultConn); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virt-admin.h b/tools/virt-admin.h index 62228ccab189..d1b1bb4f1a9e 100644 --- a/tools/virt-admin.h +++ b/tools/virt-admin.h @@ -39,7 +39,8 @@ typedef vshAdmControl *vshAdmControlPtr; * adminControl */ struct _vshAdmControl { - virAdmConnectPtr conn; /* connection to a daemon's admin server */ + virAdmDaemonPtr dmn; /* remote daemon */ + char *name; bool wantReconnect; }; diff --git a/tools/vsh.h b/tools/vsh.h index d4e9710524ad..fac62f4d4d9a 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -197,7 +197,6 @@ struct _vshControl { const char *name; /* hardcoded name of the binary that cannot * be changed without recompilation compared * to program name */ - char *connname; /* connection name */ char *progname; /* program name */ vshCmd *cmd; /* the current command */ char *cmdstr; /* string with command */ -- 2.6.3

2 1

[libvirt] [PATCH] spec: Temporarily disable new admin-related files
by Martin Kletzander 01 Dec '15

01 Dec '15

The virt-admin binary and its man page should not yet be distributed, but we need libvirt-common.h. RPM build fails without specifying these. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8420d1107ca8..9db550c2a0db 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1565,8 +1565,10 @@ mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \ $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so %endif -# Temporarily get rid of not-installed libvirt-admin.so +# Temporarily get rid of not-installed admin-related files rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so +rm -f $RPM_BUILD_ROOT%{_bindir}/virt-admin +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virsh.1* %if %{with_network} install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ @@ -2320,6 +2322,7 @@ exit 0 %dir %{_includedir}/libvirt %{_includedir}/libvirt/virterror.h %{_includedir}/libvirt/libvirt.h +%{_includedir}/libvirt/libvirt-common.h %{_includedir}/libvirt/libvirt-domain.h %{_includedir}/libvirt/libvirt-domain-snapshot.h %{_includedir}/libvirt/libvirt-event.h -- 2.6.3

2 2

[libvirt] [PATCH] admin: Include admin_remote.c in the dist package
by Martin Kletzander 01 Dec '15

01 Dec '15

Otherwise all builds from the package will fail. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule, checked by doing distcheck in VPATH, also visible on ci.centos.org src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 93b9c66662a1..be3b3c84e863 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2117,6 +2117,10 @@ libvirt_admin.syms: libvirt_admin_public.syms $(ADMIN_SYM_FILES) \ chmod a-w $@-tmp && \ mv $@-tmp libvirt_admin.syms +# admin/admin_remote.c is being included in libvirt-admin.c, so we +# need to include it in the dist +EXTRA_DIST += admin/admin_remote.c + lib_LTLIBRARIES += libvirt-admin.la libvirt_admin_la_SOURCES = \ libvirt-admin.c \ -- 2.6.3

1 0

[libvirt] [PATCH] tools: fix output of list with state-shutoff
by Wei Jiangang 01 Dec '15

01 Dec '15

Due to the default of flags is VIR_CONNECT_LIST_DOMAINS_ACTIVE, It doesn't show the domains that have been shutdown when we use 'virsh list' with only --state-shutoff. Signed-off-by: Wei Jiangang <weijg.fnst(a)cn.fujitsu.com> --- tools/virsh-domain-monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index d4e500b..7b30c4c 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1873,7 +1873,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd) unsigned int flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE; /* construct filter flags */ - if (vshCommandOptBool(cmd, "inactive")) + if (vshCommandOptBool(cmd, "inactive") || + vshCommandOptBool(cmd, "state-shutoff")) flags = VIR_CONNECT_LIST_DOMAINS_INACTIVE; if (vshCommandOptBool(cmd, "all")) -- 1.9.3

3 3

[libvirt] [PATCH 0/8] Add perf and Intel CMT feature support
by Qiaowei Ren 01 Dec '15

01 Dec '15

The series mainly adds Intel CMT feature support into libvirt. CMT is new introduced PQos (Platform Qos) feature to monitor the usage of cache by applications running on the platform. Currently CMT patches has been merged into Linux kernel mainline. The CMT implementation in Linux kernel is based on perf mechanism and there is no support for perf in libvirt, and so this series firstly add perf support into libvirt, including two public API and a set of util interfaces. And based on these APIs and interfaces, thie series implements CMT perf event support. TODO: 1. This series relys on keeping an open file descriptor for the guest. We should add one patch to call sys_perf_event_open again iff libvirtd is restarted. Qiaowei Ren (8): perf: add new public APIs for perf event perf: define internal driver API for perf event perf: implement the public APIs for perf event perf: implement the remote protocol for perf event perf: implement a set of util functions for perf event qemu_driver: add support to perf event virsh: extend domstats command virsh: implement new command to support perf daemon/remote.c | 60 +++++++++++ include/libvirt/libvirt-domain.h | 19 ++++ include/libvirt/virterror.h | 2 + src/Makefile.am | 1 + src/driver-hypervisor.h | 12 +++ src/libvirt-domain.c | 106 +++++++++++++++++++ src/libvirt_private.syms | 8 ++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 181 +++++++++++++++++++++++++++++++ src/qemu/qemu_process.c | 6 ++ src/remote/remote_driver.c | 49 +++++++++ src/remote/remote_protocol.x | 32 +++++- src/remote_protocol-structs | 20 ++++ src/util/virerror.c | 2 + src/util/virperf.c | 222 +++++++++++++++++++++++++++++++++++++++ src/util/virperf.h | 60 +++++++++++ tools/virsh-domain-monitor.c | 7 ++ tools/virsh-domain.c | 139 ++++++++++++++++++++++++ tools/virsh.pod | 15 ++- 20 files changed, 947 insertions(+), 3 deletions(-) create mode 100644 src/util/virperf.c create mode 100644 src/util/virperf.h -- 1.9.1

4 29

[libvirt] [PATCH 0/8] qemu: add support for virtio-input devices
by Ján Tomko 30 Nov '15

30 Nov '15

Support virtio-keyboard, virtio-mouse, virtio-tablet and virtio-input-host. Requires kernel 4.1+ in the guest. https://www.kraxel.org/blog/2015/06/new-member-in-the-virtio-family-input-d… https://bugzilla.redhat.com/show_bug.cgi?id=1231114 Ján Tomko (8): qemu: add capabilities for virtio input devices conf: parse and format virtio input bus in domain XML qemu: build command line for virtio input devices qemu: add capability for virtio-input-host-device conf: add XML for input device passthrough security: label the evdev for input device passthrough qemu: add passed-through input devs to cgroup ACL qemu: build command line for virtio-input-host device docs/formatdomain.html.in | 18 ++++- docs/schemas/domaincommon.rng | 50 ++++++++---- src/conf/domain_conf.c | 34 ++++++-- src/conf/domain_conf.h | 5 ++ src/qemu/qemu_capabilities.c | 12 +++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_cgroup.c | 25 ++++++ src/qemu/qemu_command.c | 92 +++++++++++++++++++++- src/security/security_dac.c | 72 +++++++++++++++++ src/security/security_selinux.c | 70 ++++++++++++++++ tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 4 + .../qemuxml2argv-virtio-input-passthrough.args | 22 ++++++ .../qemuxml2argv-virtio-input-passthrough.xml | 24 ++++++ .../qemuxml2argv-virtio-input.args | 23 ++++++ .../qemuxml2argvdata/qemuxml2argv-virtio-input.xml | 26 ++++++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmltest.c | 3 + 17 files changed, 462 insertions(+), 26 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-input.xml -- 2.4.6

4 17

[libvirt] [PATCH] build: Create needed folders without dependency tracking
by Martin Kletzander 30 Nov '15

30 Nov '15

The parameter --disable-dependency-tracking is supposed to speed up one-time build due to the fact that it disables some dependency extractors that, apparently, take longer time to execute. That is a problem for code that is generated into builddir (especially some specific subdirectory) because the directory it should be installed to does not exists in VPATH and without the dependency tracking is not created. Generating such file hence fails with -ENOENT. In order to keep generating files into builddir instead of srcdir, we must create the directory ourselves. This should finally fix the problem that is being fixed multiple times since its introduction in commit a9fe62037214 and let us continue with cleaning those parts of Makefiles that depend on generating files into the srcdir rather than builddir as it should be. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index bcbee9de11d6..93b9c66662a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -181,6 +181,7 @@ MAINTAINERCLEANFILES += util/virkeymaps.h util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py + $(MKDIR_P) util/ $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ <$(srcdir)/util/keymaps.csv >util/virkeymaps.h -- 2.6.3

2 4

[libvirt] [PATCH] util: Avoid variable named 'truncate' shadowing global declaration
by Martin Kletzander 30 Nov '15

30 Nov '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule as trivial. src/util/virrotatingfile.c | 6 +++--- src/util/virrotatingfile.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 827b44b6f948..a32759abe66d 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -219,7 +219,7 @@ virRotatingFileWriterDelete(virRotatingFileWriterPtr file) * @path: the base path for files * @maxlen: the maximum number of bytes to write before rollover * @maxbackup: number of backup files to keep when rolling over - * @truncate: whether to truncate the current files when opening + * @trunc: whether to truncate the current files when opening * @mode: the file mode to use for creating new files * * Create a new object for writing data to a file with @@ -235,7 +235,7 @@ virRotatingFileWriterPtr virRotatingFileWriterNew(const char *path, off_t maxlen, size_t maxbackup, - bool truncate, + bool trunc, mode_t mode) { virRotatingFileWriterPtr file; @@ -257,7 +257,7 @@ virRotatingFileWriterNew(const char *path, file->maxbackup = maxbackup; file->maxlen = maxlen; - if (truncate && + if (trunc && virRotatingFileWriterDelete(file) < 0) goto error; diff --git a/src/util/virrotatingfile.h b/src/util/virrotatingfile.h index 30cc8a540896..7848443101a6 100644 --- a/src/util/virrotatingfile.h +++ b/src/util/virrotatingfile.h @@ -33,7 +33,7 @@ typedef virRotatingFileReader *virRotatingFileReaderPtr; virRotatingFileWriterPtr virRotatingFileWriterNew(const char *path, off_t maxlen, size_t maxbackup, - bool truncate, + bool trunc, mode_t mode); virRotatingFileReaderPtr virRotatingFileReaderNew(const char *path, -- 2.6.3

1 0

[libvirt] [PATCH] include: Install libvirt-common.h
by Martin Kletzander 30 Nov '15

30 Nov '15

Otherwise nobody will be able to include libvirt.h. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- include/libvirt/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am index 8e5b1b873dd7..5a4ada0b77d2 100644 --- a/include/libvirt/Makefile.am +++ b/include/libvirt/Makefile.am @@ -19,6 +19,7 @@ virincdir = $(includedir)/libvirt virinc_HEADERS = libvirt.h \ + libvirt-common.h \ libvirt-domain.h \ libvirt-domain-snapshot.h \ libvirt-event.h \ -- 2.6.3

2 1

[libvirt] [PATCH] guest-agent-socket: don't generate default path to config XML
by Pavel Hrdina 30 Nov '15

30 Nov '15

While we started using for all unix sockets as default one common directory based on a guest name it introduced several issues, for example with renaming the guest or cloning it. In general it's not entirely bad, but in this case it would be best to hide the auto-generated socket path from user and don't export it in the config XML. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 28 ++++++++++++++++++++++++++++ src/qemu/qemu_command.h | 1 + src/qemu/qemu_domain.c | 16 ---------------- src/qemu/qemu_driver.c | 10 ++++++++++ src/qemu/qemu_process.c | 3 +++ tests/qemuhotplugtest.c | 5 +++++ tests/qemuxml2argvtest.c | 5 +++++ 8 files changed, 53 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cbfc41e..ebae828 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9810,7 +9810,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, goto error; } - def->data.nix.listen = mode != NULL && STRNEQ(mode, "connect"); + def->data.nix.listen = mode == NULL || STRNEQ(mode, "connect"); def->data.nix.path = path; path = NULL; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2a9fab5..f1bb621 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1262,6 +1262,34 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) } +int +qemuUnixSocketGenerate(virDomainDefPtr def, + virQEMUDriverConfigPtr cfg) +{ + size_t i; + + for (i = 0; i < def->nchannels; i++) { + virDomainChrDefPtr channel = def->channels[i]; + + if (channel->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + channel->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + channel->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && + !channel->source.data.nix.path) { + if (virAsprintf(&channel->source.data.nix.path, + "%s/domain-%s/%s", + cfg->channelTargetDir, def->name, + channel->target.name ? channel->target.name + : "unknown.sock") < 0) + return -1; + + channel->source.data.nix.listen = true; + } + } + + return 0; +} + + static void qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def, virDomainDeviceAddressType type) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bebdd27..0512a23 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -283,6 +283,7 @@ int qemuAssignDevicePCISlots(virDomainDefPtr def, virDomainPCIAddressSetPtr addrs); int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); +int qemuUnixSocketGenerate(virDomainDefPtr def, virQEMUDriverConfigPtr cfg); int qemuDomainNetVLAN(virDomainNetDefPtr def); int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx); int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed21245..7e05289 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1329,22 +1329,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, ARCH_IS_S390(def->os.arch)) dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; - /* auto generate unix socket path */ - if (dev->type == VIR_DOMAIN_DEVICE_CHR && - dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && - dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && - !dev->data.chr->source.data.nix.path) { - if (virAsprintf(&dev->data.chr->source.data.nix.path, - "%s/domain-%s/%s", - cfg->channelTargetDir, def->name, - dev->data.chr->target.name ? dev->data.chr->target.name - : "unknown.sock") < 0) - goto cleanup; - - dev->data.chr->source.data.nix.listen = true; - } - /* forbid capabilities mode hostdev in this kind of hypervisor */ if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae1d8e7..b4fac55 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7254,6 +7254,9 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup; + if (qemuUnixSocketGenerate(def, cfg) < 0) + goto cleanup; + if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0) goto cleanup; @@ -15846,6 +15849,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; + virQEMUDriverConfigPtr cfg = NULL; virDomainObjPtr vm = NULL; virDomainDefPtr def = NULL; virDomainPtr dom = NULL; @@ -15858,6 +15862,8 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, virCheckFlags(0, NULL); + cfg = virQEMUDriverGetConfig(driver); + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -15895,6 +15901,9 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup; + if (qemuUnixSocketGenerate(def, cfg) < 0) + goto cleanup; + if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0) goto cleanup; @@ -15936,6 +15945,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, VIR_FREE(pidfile); virObjectUnref(caps); virObjectUnref(qemuCaps); + virObjectUnref(cfg); return dom; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 192730c..29cf965 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4663,6 +4663,9 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) goto cleanup; + if (qemuUnixSocketGenerate(vm->def, cfg) < 0) + goto cleanup; + /* Get the advisory nodeset from numad if 'placement' of * either <vcpu> or <numatune> is 'auto'. */ diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 102e052..b17cca2 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -61,6 +61,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, { int ret = -1; qemuDomainObjPrivatePtr priv = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(&driver); if (!(*vm = virDomainObjNew(xmlopt))) goto cleanup; @@ -94,10 +95,14 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) goto cleanup; + if (qemuUnixSocketGenerate((*vm)->def, cfg) < 0) + goto cleanup; + (*vm)->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID; ret = 0; cleanup: + virObjectUnref(cfg); return ret; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f7596a0..f6083db 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -262,6 +262,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virCommandPtr cmd = NULL; size_t i; virBitmapPtr nodeset = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(&driver); if (!(conn = virGetConnect())) goto out; @@ -324,6 +325,9 @@ static int testCompareXMLToArgvFiles(const char *xml, if (qemuAssignDeviceAliases(vmdef, extraFlags) < 0) goto out; + if (qemuUnixSocketGenerate(vmdef, cfg) < 0) + goto out; + for (i = 0; i < vmdef->nhostdevs; i++) { virDomainHostdevDefPtr hostdev = vmdef->hostdevs[i]; @@ -387,6 +391,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virCommandFree(cmd); virDomainDefFree(vmdef); virObjectUnref(conn); + virObjectUnref(cfg); virBitmapFree(nodeset); return ret; } -- 2.6.3

2 3

[libvirt] [PATCH] sheepdog: allow snapshot
by Vasiliy Tolstov 30 Nov '15

30 Nov '15

In commit f7c1410b0ee5b878e81f2eddf86c609947a9b27c libvirt devs disable creating snapshot with sheepdog storage and raw image format. This patch allows creating snapshot (without --live flag for now) Vasiliy Tolstov (1): sheepdog: allow snapshot src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.5.0

2 8

[libvirt] [PATCH v2] conf: Split virDomainObjList into a separate file
by Michal Privoznik 30 Nov '15

30 Nov '15

Our domain_conf.* files are big enough. Not only they contain XML parsing code, but they served as a storage of all functions whose name is virDomain prefixed. This is just wrong as it gathers not related functions (and modules) into one big file which is then harder to maintain. Split virDomainObjList module into a separate file called virdomainobjlist.[ch]. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -rebase to current HEAD po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/domain_conf.c | 936 ---------------------------------------- src/conf/domain_conf.h | 120 ------ src/conf/nwfilter_conf.h | 2 +- src/conf/virdomainobjlist.c | 999 +++++++++++++++++++++++++++++++++++++++++++ src/conf/virdomainobjlist.h | 151 +++++++ src/esx/esx_driver.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/libvirt_private.syms | 39 +- src/libxl/libxl_conf.h | 2 +- src/openvz/openvz_conf.h | 2 +- src/test/test_driver.c | 1 + src/uml/uml_conf.h | 2 +- src/util/virclosecallbacks.h | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.h | 2 +- src/vz/vz_utils.h | 1 + tools/virsh-domain-monitor.c | 2 +- 19 files changed, 1186 insertions(+), 1085 deletions(-) create mode 100644 src/conf/virdomainobjlist.c create mode 100644 src/conf/virdomainobjlist.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 0cc5b99..f007d3e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -36,6 +36,7 @@ src/conf/secret_conf.c src/conf/snapshot_conf.c src/conf/storage_conf.c src/conf/virchrdev.c +src/conf/virdomainobjlist.c src/cpu/cpu.c src/cpu/cpu_generic.c src/cpu/cpu_map.c diff --git a/src/Makefile.am b/src/Makefile.am index 99b4993..26d29a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -277,7 +277,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.c conf/domain_audit.h \ conf/domain_nwfilter.c conf/domain_nwfilter.h \ conf/snapshot_conf.c conf/snapshot_conf.h \ - conf/numa_conf.c conf/numa_conf.h + conf/numa_conf.c conf/numa_conf.h \ + conf/virdomainobjlist.c conf/virdomainobjlist.h OBJECT_EVENT_SOURCES = \ conf/object_event.c conf/object_event.h \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0ac7dbf..1093a5e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -24,7 +24,6 @@ #include <config.h> -#include <dirent.h> #include <fcntl.h> #include <sys/stat.h> #include <unistd.h> @@ -59,19 +58,6 @@ VIR_LOG_INIT("conf.domain_conf"); -struct _virDomainObjList { - virObjectLockable parent; - - /* uuid string -> virDomainObj mapping - * for O(1), lockless lookup-by-uuid */ - virHashTable *objs; - - /* name -> virDomainObj mapping for O(1), - * lockless lookup-by-name */ - virHashTable *objsName; -}; - - /* This structure holds various callbacks and data needed * while parsing and creating domain XMLs */ struct _virDomainXMLOption { @@ -818,10 +804,8 @@ VIR_ENUM_IMPL(virDomainMemoryModel, VIR_DOMAIN_MEMORY_MODEL_LAST, "", "dimm") static virClassPtr virDomainObjClass; -static virClassPtr virDomainObjListClass; static virClassPtr virDomainXMLOptionClass; static void virDomainObjDispose(void *obj); -static void virDomainObjListDispose(void *obj); static void virDomainXMLOptionClassDispose(void *obj); static int virDomainObjOnceInit(void) @@ -832,12 +816,6 @@ static int virDomainObjOnceInit(void) virDomainObjDispose))) return -1; - if (!(virDomainObjListClass = virClassNew(virClassForObjectLockable(), - "virDomainObjList", - sizeof(virDomainObjList), - virDomainObjListDispose))) - return -1; - if (!(virDomainXMLOptionClass = virClassNew(virClassForObject(), "virDomainXMLOption", sizeof(virDomainXMLOption), @@ -1187,134 +1165,6 @@ virDomainDeviceDefCheckUnsupportedMemoryDevice(virDomainDeviceDefPtr dev) } -virDomainObjListPtr virDomainObjListNew(void) -{ - virDomainObjListPtr doms; - - if (virDomainObjInitialize() < 0) - return NULL; - - if (!(doms = virObjectLockableNew(virDomainObjListClass))) - return NULL; - - if (!(doms->objs = virHashCreate(50, virObjectFreeHashData)) || - !(doms->objsName = virHashCreate(50, virObjectFreeHashData))) { - virObjectUnref(doms); - return NULL; - } - - return doms; -} - - -static void virDomainObjListDispose(void *obj) -{ - virDomainObjListPtr doms = obj; - - virHashFree(doms->objs); - virHashFree(doms->objsName); -} - - -static int virDomainObjListSearchID(const void *payload, - const void *name ATTRIBUTE_UNUSED, - const void *data) -{ - virDomainObjPtr obj = (virDomainObjPtr)payload; - const int *id = data; - int want = 0; - - virObjectLock(obj); - if (virDomainObjIsActive(obj) && - obj->def->id == *id) - want = 1; - virObjectUnlock(obj); - return want; -} - -virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, - int id) -{ - virDomainObjPtr obj; - virObjectLock(doms); - obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id); - if (obj) { - virObjectLock(obj); - if (obj->removing) { - virObjectUnlock(obj); - obj = NULL; - } - } - virObjectUnlock(doms); - return obj; -} - - -static virDomainObjPtr -virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, - const unsigned char *uuid, - bool ref) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virDomainObjPtr obj; - - virObjectLock(doms); - virUUIDFormat(uuid, uuidstr); - - obj = virHashLookup(doms->objs, uuidstr); - if (ref) { - virObjectRef(obj); - virObjectUnlock(doms); - } - if (obj) { - virObjectLock(obj); - if (obj->removing) { - virObjectUnlock(obj); - if (ref) - virObjectUnref(obj); - obj = NULL; - } - } - if (!ref) - virObjectUnlock(doms); - return obj; -} - -virDomainObjPtr -virDomainObjListFindByUUID(virDomainObjListPtr doms, - const unsigned char *uuid) -{ - return virDomainObjListFindByUUIDInternal(doms, uuid, false); -} - -virDomainObjPtr -virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, - const unsigned char *uuid) -{ - return virDomainObjListFindByUUIDInternal(doms, uuid, true); -} - -virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, - const char *name) -{ - virDomainObjPtr obj; - - virObjectLock(doms); - obj = virHashLookup(doms->objsName, name); - virObjectRef(obj); - virObjectUnlock(doms); - if (obj) { - virObjectLock(obj); - if (obj->removing) { - virObjectUnlock(obj); - virObjectUnref(obj); - obj = NULL; - } - } - return obj; -} - - bool virDomainObjTaint(virDomainObjPtr obj, virDomainTaintFlags taint) { @@ -2810,153 +2660,6 @@ virDomainObjWaitUntil(virDomainObjPtr vm, /* - * - * If flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE then - * this will refuse updating an existing def if the - * current def is Live - * - * If flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE then - * the @def being added is assumed to represent a - * live config, not a future inactive config - * - */ -static virDomainObjPtr -virDomainObjListAddLocked(virDomainObjListPtr doms, - virDomainDefPtr def, - virDomainXMLOptionPtr xmlopt, - unsigned int flags, - virDomainDefPtr *oldDef) -{ - virDomainObjPtr vm; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - if (oldDef) - *oldDef = NULL; - - virUUIDFormat(def->uuid, uuidstr); - - /* See if a VM with matching UUID already exists */ - if ((vm = virHashLookup(doms->objs, uuidstr))) { - virObjectLock(vm); - /* UUID matches, but if names don't match, refuse it */ - if (STRNEQ(vm->def->name, def->name)) { - virUUIDFormat(vm->def->uuid, uuidstr); - virReportError(VIR_ERR_OPERATION_FAILED, - _("domain '%s' is already defined with uuid %s"), - vm->def->name, uuidstr); - goto error; - } - - if (flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE) { - /* UUID & name match, but if VM is already active, refuse it */ - if (virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("domain '%s' is already active"), - vm->def->name); - goto error; - } - if (!vm->persistent) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("domain '%s' is already being started"), - vm->def->name); - goto error; - } - } - - virDomainObjAssignDef(vm, - def, - !!(flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE), - oldDef); - } else { - /* UUID does not match, but if a name matches, refuse it */ - if ((vm = virHashLookup(doms->objsName, def->name))) { - virObjectLock(vm); - virUUIDFormat(vm->def->uuid, uuidstr); - virReportError(VIR_ERR_OPERATION_FAILED, - _("domain '%s' already exists with uuid %s"), - def->name, uuidstr); - goto error; - } - - if (!(vm = virDomainObjNew(xmlopt))) - goto cleanup; - vm->def = def; - - virUUIDFormat(def->uuid, uuidstr); - if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) { - virObjectUnref(vm); - return NULL; - } - - if (virHashAddEntry(doms->objsName, def->name, vm) < 0) { - virHashRemoveEntry(doms->objs, uuidstr); - return NULL; - } - - /* Since domain is in two hash tables, increment the - * reference counter */ - virObjectRef(vm); - } - cleanup: - return vm; - - error: - virObjectUnlock(vm); - vm = NULL; - goto cleanup; -} - - -virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, - virDomainDefPtr def, - virDomainXMLOptionPtr xmlopt, - unsigned int flags, - virDomainDefPtr *oldDef) -{ - virDomainObjPtr ret; - - virObjectLock(doms); - ret = virDomainObjListAddLocked(doms, def, xmlopt, flags, oldDef); - virObjectUnlock(doms); - return ret; -} - - -int -virDomainObjListRenameAddNew(virDomainObjListPtr doms, - virDomainObjPtr vm, - const char *name) -{ - int ret = -1; - virObjectLock(doms); - - /* Add new name into the hash table of domain names. */ - if (virHashAddEntry(doms->objsName, name, vm) < 0) - goto cleanup; - - /* Okay, this is crazy. virHashAddEntry() does not increment - * the refcounter of @vm, but virHashRemoveEntry() does - * decrement it. We need to work around it. */ - virObjectRef(vm); - - ret = 0; - cleanup: - virObjectUnlock(doms); - return ret; -} - - -int -virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name) -{ - virObjectLock(doms); - virHashRemoveEntry(doms->objsName, name); - virObjectUnlock(doms); - return 0; -} - - -/* * Mark the running VM config as transient. Ensures transient hotplug * operations do not persist past shutdown. * @@ -3177,48 +2880,6 @@ virDomainObjGetOneDef(virDomainObjPtr vm, } -/* - * The caller must hold a lock on the driver owning 'doms', - * and must also have locked 'dom', to ensure no one else - * is either waiting for 'dom' or still using it - */ -void virDomainObjListRemove(virDomainObjListPtr doms, - virDomainObjPtr dom) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - dom->removing = true; - virUUIDFormat(dom->def->uuid, uuidstr); - virObjectRef(dom); - virObjectUnlock(dom); - - virObjectLock(doms); - virObjectLock(dom); - virHashRemoveEntry(doms->objs, uuidstr); - virHashRemoveEntry(doms->objsName, dom->def->name); - virObjectUnlock(dom); - virObjectUnref(dom); - virObjectUnlock(doms); -} - -/* The caller must hold lock on 'doms' in addition to 'virDomainObjListRemove' - * requirements - * - * Can be used to remove current element while iterating with - * virDomainObjListForEach - */ -void virDomainObjListRemoveLocked(virDomainObjListPtr doms, - virDomainObjPtr dom) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - virUUIDFormat(dom->def->uuid, uuidstr); - - virHashRemoveEntry(doms->objs, uuidstr); - virHashRemoveEntry(doms->objsName, dom->def->name); - virObjectUnlock(dom); -} - static int virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr) { @@ -22768,179 +22429,6 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, } -static virDomainObjPtr -virDomainObjListLoadConfig(virDomainObjListPtr doms, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - const char *configDir, - const char *autostartDir, - const char *name, - virDomainLoadConfigNotify notify, - void *opaque) -{ - char *configFile = NULL, *autostartLink = NULL; - virDomainDefPtr def = NULL; - virDomainObjPtr dom; - int autostart; - virDomainDefPtr oldDef = NULL; - - if ((configFile = virDomainConfigFile(configDir, name)) == NULL) - goto error; - if (!(def = virDomainDefParseFile(configFile, caps, xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) - goto error; - - if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) - goto error; - - if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) - goto error; - - if (!(dom = virDomainObjListAddLocked(doms, def, xmlopt, 0, &oldDef))) - goto error; - - dom->autostart = autostart; - - if (notify) - (*notify)(dom, oldDef == NULL, opaque); - - virDomainDefFree(oldDef); - VIR_FREE(configFile); - VIR_FREE(autostartLink); - return dom; - - error: - VIR_FREE(configFile); - VIR_FREE(autostartLink); - virDomainDefFree(def); - return NULL; -} - -static virDomainObjPtr -virDomainObjListLoadStatus(virDomainObjListPtr doms, - const char *statusDir, - const char *name, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - virDomainLoadConfigNotify notify, - void *opaque) -{ - char *statusFile = NULL; - virDomainObjPtr obj = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - if ((statusFile = virDomainConfigFile(statusDir, name)) == NULL) - goto error; - - if (!(obj = virDomainObjParseFile(statusFile, caps, xmlopt, - VIR_DOMAIN_DEF_PARSE_STATUS | - VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | - VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES | - VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) - goto error; - - virUUIDFormat(obj->def->uuid, uuidstr); - - if (virHashLookup(doms->objs, uuidstr) != NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected domain %s already exists"), - obj->def->name); - goto error; - } - - if (virHashAddEntry(doms->objs, uuidstr, obj) < 0) - goto error; - - if (virHashAddEntry(doms->objsName, obj->def->name, obj) < 0) { - virHashRemoveEntry(doms->objs, uuidstr); - goto error; - } - - /* Since domain is in two hash tables, increment the - * reference counter */ - virObjectRef(obj); - - if (notify) - (*notify)(obj, 1, opaque); - - VIR_FREE(statusFile); - return obj; - - error: - virObjectUnref(obj); - VIR_FREE(statusFile); - return NULL; -} - -int -virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, - const char *configDir, - const char *autostartDir, - int liveStatus, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - virDomainLoadConfigNotify notify, - void *opaque) -{ - DIR *dir; - struct dirent *entry; - int ret = -1; - - VIR_INFO("Scanning for configs in %s", configDir); - - if (!(dir = opendir(configDir))) { - if (errno == ENOENT) - return 0; - virReportSystemError(errno, - _("Failed to open dir '%s'"), - configDir); - return -1; - } - - virObjectLock(doms); - - while ((ret = virDirRead(dir, &entry, configDir)) > 0) { - virDomainObjPtr dom; - - if (entry->d_name[0] == '.') - continue; - - if (!virFileStripSuffix(entry->d_name, ".xml")) - continue; - - /* NB: ignoring errors, so one malformed config doesn't - kill the whole process */ - VIR_INFO("Loading config file '%s.xml'", entry->d_name); - if (liveStatus) - dom = virDomainObjListLoadStatus(doms, - configDir, - entry->d_name, - caps, - xmlopt, - notify, - opaque); - else - dom = virDomainObjListLoadConfig(doms, - caps, - xmlopt, - configDir, - autostartDir, - entry->d_name, - notify, - opaque); - if (dom) { - if (!liveStatus) - dom->persistent = 1; - virObjectUnlock(dom); - } - } - - closedir(dir); - virObjectUnlock(doms); - return ret; -} - int virDomainDeleteConfig(const char *configDir, const char *autostartDir, @@ -23057,178 +22545,6 @@ virDomainGetFilesystemForTarget(virDomainDefPtr def, } -struct virDomainObjListData { - virDomainObjListACLFilter filter; - virConnectPtr conn; - bool active; - int count; -}; - -static void -virDomainObjListCount(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - virDomainObjPtr obj = payload; - struct virDomainObjListData *data = opaque; - virObjectLock(obj); - if (data->filter && - !data->filter(data->conn, obj->def)) - goto cleanup; - if (virDomainObjIsActive(obj)) { - if (data->active) - data->count++; - } else { - if (!data->active) - data->count++; - } - cleanup: - virObjectUnlock(obj); -} - -int -virDomainObjListNumOfDomains(virDomainObjListPtr doms, - bool active, - virDomainObjListACLFilter filter, - virConnectPtr conn) -{ - struct virDomainObjListData data = { filter, conn, active, 0 }; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListCount, &data); - virObjectUnlock(doms); - return data.count; -} - -struct virDomainIDData { - virDomainObjListACLFilter filter; - virConnectPtr conn; - int numids; - int maxids; - int *ids; -}; - -static void -virDomainObjListCopyActiveIDs(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - virDomainObjPtr obj = payload; - struct virDomainIDData *data = opaque; - virObjectLock(obj); - if (data->filter && - !data->filter(data->conn, obj->def)) - goto cleanup; - if (virDomainObjIsActive(obj) && data->numids < data->maxids) - data->ids[data->numids++] = obj->def->id; - cleanup: - virObjectUnlock(obj); -} - -int -virDomainObjListGetActiveIDs(virDomainObjListPtr doms, - int *ids, - int maxids, - virDomainObjListACLFilter filter, - virConnectPtr conn) -{ - struct virDomainIDData data = { filter, conn, - 0, maxids, ids }; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListCopyActiveIDs, &data); - virObjectUnlock(doms); - return data.numids; -} - -struct virDomainNameData { - virDomainObjListACLFilter filter; - virConnectPtr conn; - int oom; - int numnames; - int maxnames; - char **const names; -}; - -static void -virDomainObjListCopyInactiveNames(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - virDomainObjPtr obj = payload; - struct virDomainNameData *data = opaque; - - if (data->oom) - return; - - virObjectLock(obj); - if (data->filter && - !data->filter(data->conn, obj->def)) - goto cleanup; - if (!virDomainObjIsActive(obj) && data->numnames < data->maxnames) { - if (VIR_STRDUP(data->names[data->numnames], obj->def->name) < 0) - data->oom = 1; - else - data->numnames++; - } - cleanup: - virObjectUnlock(obj); -} - - -int -virDomainObjListGetInactiveNames(virDomainObjListPtr doms, - char **const names, - int maxnames, - virDomainObjListACLFilter filter, - virConnectPtr conn) -{ - struct virDomainNameData data = { filter, conn, - 0, 0, maxnames, names }; - size_t i; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data); - virObjectUnlock(doms); - if (data.oom) { - for (i = 0; i < data.numnames; i++) - VIR_FREE(data.names[i]); - return -1; - } - - return data.numnames; -} - - -struct virDomainListIterData { - virDomainObjListIterator callback; - void *opaque; - int ret; -}; - -static void -virDomainObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - struct virDomainListIterData *data = opaque; - - if (data->callback(payload, data->opaque) < 0) - data->ret = -1; -} - -int -virDomainObjListForEach(virDomainObjListPtr doms, - virDomainObjListIterator callback, - void *opaque) -{ - struct virDomainListIterData data = { - callback, opaque, 0, - }; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListHelper, &data); - virObjectUnlock(doms); - return data.ret; -} - - int virDomainChrDefForeach(virDomainDefPtr def, bool abortOnError, @@ -23943,258 +23259,6 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, } -#define MATCH(FLAG) (filter & (FLAG)) -static bool -virDomainObjMatchFilter(virDomainObjPtr vm, - unsigned int filter) -{ - /* filter by active state */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_ACTIVE) && - virDomainObjIsActive(vm)) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_INACTIVE) && - !virDomainObjIsActive(vm)))) - return false; - - /* filter by persistence */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT) && - vm->persistent) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && - !vm->persistent))) - return false; - - /* filter by domain state */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE)) { - int st = virDomainObjGetState(vm, NULL); - if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_RUNNING) && - st == VIR_DOMAIN_RUNNING) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_PAUSED) && - st == VIR_DOMAIN_PAUSED) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_SHUTOFF) && - st == VIR_DOMAIN_SHUTOFF) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_OTHER) && - (st != VIR_DOMAIN_RUNNING && - st != VIR_DOMAIN_PAUSED && - st != VIR_DOMAIN_SHUTOFF)))) - return false; - } - - /* filter by existence of managed save state */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE) && - vm->hasManagedSave) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) && - !vm->hasManagedSave))) - return false; - - /* filter by autostart option */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_AUTOSTART) && vm->autostart) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) && !vm->autostart))) - return false; - - /* filter by snapshot existence */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { - int nsnap = virDomainSnapshotObjListNum(vm->snapshots, NULL, 0); - if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && nsnap > 0) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) && nsnap <= 0))) - return false; - } - - return true; -} -#undef MATCH - - -struct virDomainListData { - virDomainObjPtr *vms; - size_t nvms; -}; - - -static void -virDomainObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - struct virDomainListData *data = opaque; - - data->vms[data->nvms++] = virObjectRef(payload); -} - - -static void -virDomainObjListFilter(virDomainObjPtr **list, - size_t *nvms, - virConnectPtr conn, - virDomainObjListACLFilter filter, - unsigned int flags) -{ - size_t i = 0; - - while (i < *nvms) { - virDomainObjPtr vm = (*list)[i]; - - virObjectLock(vm); - - /* do not list the object if: - * 1) it's being removed. - * 2) connection does not have ACL to see it - * 3) it doesn't match the filter - */ - if (vm->removing || - (filter && !filter(conn, vm->def)) || - !virDomainObjMatchFilter(vm, flags)) { - virObjectUnlock(vm); - virObjectUnref(vm); - VIR_DELETE_ELEMENT(*list, i, *nvms); - continue; - } - - virObjectUnlock(vm); - i++; - } -} - - -int -virDomainObjListCollect(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags) -{ - struct virDomainListData data = { NULL, 0 }; - ssize_t hash_size; - - virObjectLock(domlist); - if ((hash_size = virHashSize(domlist->objs)) < 0 || - (VIR_ALLOC_N(data.vms, hash_size) < 0)) { - virObjectUnlock(domlist); - return -1; - } - - virHashForEach(domlist->objs, virDomainObjListCollectIterator, &data); - virObjectUnlock(domlist); - - virDomainObjListFilter(&data.vms, &data.nvms, conn, filter, flags); - - *nvms = data.nvms; - *vms = data.vms; - - return 0; -} - - -int -virDomainObjListConvert(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainPtr *doms, - size_t ndoms, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags, - bool skip_missing) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virDomainObjPtr vm; - size_t i; - - *nvms = 0; - *vms = NULL; - - virObjectLock(domlist); - for (i = 0; i < ndoms; i++) { - virDomainPtr dom = doms[i]; - - virUUIDFormat(dom->uuid, uuidstr); - - if (!(vm = virHashLookup(domlist->objs, uuidstr))) { - if (skip_missing) - continue; - - virObjectUnlock(domlist); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), - uuidstr, dom->name); - goto error; - } - - virObjectRef(vm); - - if (VIR_APPEND_ELEMENT(*vms, *nvms, vm) < 0) { - virObjectUnlock(domlist); - virObjectUnref(vm); - goto error; - } - } - virObjectUnlock(domlist); - - if (*vms) - virDomainObjListFilter(vms, nvms, conn, filter, flags); - - return 0; - - error: - virObjectListFreeCount(*vms, *nvms); - *vms = NULL; - *nvms = 0; - - return -1; -} - - -int -virDomainObjListExport(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainPtr **domains, - virDomainObjListACLFilter filter, - unsigned int flags) -{ - virDomainObjPtr *vms = NULL; - virDomainPtr *doms = NULL; - size_t nvms = 0; - size_t i; - int ret = -1; - - if (virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags) < 0) - return -1; - - if (domains) { - if (VIR_ALLOC_N(doms, nvms + 1) < 0) - goto cleanup; - - for (i = 0; i < nvms; i++) { - virDomainObjPtr vm = vms[i]; - - virObjectLock(vm); - - if (!(doms[i] = virGetDomain(conn, vm->def->name, vm->def->uuid))) { - virObjectUnlock(vm); - goto cleanup; - } - - doms[i]->id = vm->def->id; - - virObjectUnlock(vm); - } - - *domains = doms; - doms = NULL; - } - - ret = nvms; - - cleanup: - virObjectListFree(doms); - virObjectListFreeCount(vms, nvms); - return ret; -} - - virSecurityLabelDefPtr virDomainDefGetSecurityLabelDef(virDomainDefPtr def, const char *model) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8d43ee6..3d1d142 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2388,9 +2388,6 @@ struct _virDomainObj { int taint; }; -typedef struct _virDomainObjList virDomainObjList; -typedef virDomainObjList *virDomainObjListPtr; - typedef bool (*virDomainObjListACLFilter)(virConnectPtr conn, virDomainDefPtr def); @@ -2472,17 +2469,6 @@ virDomainObjIsActive(virDomainObjPtr dom) virDomainObjPtr virDomainObjNew(virDomainXMLOptionPtr caps) ATTRIBUTE_NONNULL(1); -virDomainObjListPtr virDomainObjListNew(void); - -virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, - int id); -virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, - const unsigned char *uuid); -virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, - const unsigned char *uuid); -virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, - const char *name); - void virDomainObjEndAPI(virDomainObjPtr *vm); bool virDomainObjTaint(virDomainObjPtr obj, @@ -2579,20 +2565,6 @@ virDomainDefPtr virDomainDefNewFull(const char *name, const unsigned char *uuid, int id); -enum { - VIR_DOMAIN_OBJ_LIST_ADD_LIVE = (1 << 0), - VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE = (1 << 1), -}; -virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, - virDomainDefPtr def, - virDomainXMLOptionPtr xmlopt, - unsigned int flags, - virDomainDefPtr *oldDef); -int virDomainObjListRenameAddNew(virDomainObjListPtr doms, - virDomainObjPtr vm, - const char *name); -int virDomainObjListRenameRemove(virDomainObjListPtr doms, - const char *name); void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, bool live, @@ -2630,11 +2602,6 @@ virDomainDefPtr virDomainObjCopyPersistentDef(virDomainObjPtr dom, virCapsPtr caps, virDomainXMLOptionPtr xmlopt); -void virDomainObjListRemove(virDomainObjListPtr doms, - virDomainObjPtr dom); -void virDomainObjListRemoveLocked(virDomainObjListPtr doms, - virDomainObjPtr dom); - typedef enum { /* parse internal domain status information */ VIR_DOMAIN_DEF_PARSE_STATUS = 1 << 0, @@ -2905,15 +2872,6 @@ typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, int newDomain, void *opaque); -int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, - const char *configDir, - const char *autostartDir, - int liveStatus, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - virDomainLoadConfigNotify notify, - void *opaque); - int virDomainDeleteConfig(const char *configDir, const char *autostartDir, virDomainObjPtr dom); @@ -2935,29 +2893,6 @@ int virDomainVideoDefaultType(const virDomainDef *def); unsigned int virDomainVideoDefaultRAM(const virDomainDef *def, const virDomainVideoType type); -int virDomainObjListNumOfDomains(virDomainObjListPtr doms, - bool active, - virDomainObjListACLFilter filter, - virConnectPtr conn); - -int virDomainObjListGetActiveIDs(virDomainObjListPtr doms, - int *ids, - int maxids, - virDomainObjListACLFilter filter, - virConnectPtr conn); -int virDomainObjListGetInactiveNames(virDomainObjListPtr doms, - char **const names, - int maxnames, - virDomainObjListACLFilter filter, - virConnectPtr conn); - -typedef int (*virDomainObjListIterator)(virDomainObjPtr dom, - void *opaque); - -int virDomainObjListForEach(virDomainObjListPtr doms, - virDomainObjListIterator callback, - void *opaque); - typedef int (*virDomainSmartcardDefIterator)(virDomainDefPtr def, virDomainSmartcardDefPtr dev, void *opaque); @@ -3113,61 +3048,6 @@ VIR_ENUM_DECL(virDomainCpuPlacementMode) VIR_ENUM_DECL(virDomainStartupPolicy) -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \ - (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \ - VIR_CONNECT_LIST_DOMAINS_INACTIVE) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \ - (VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \ - VIR_CONNECT_LIST_DOMAINS_TRANSIENT) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \ - (VIR_CONNECT_LIST_DOMAINS_RUNNING | \ - VIR_CONNECT_LIST_DOMAINS_PAUSED | \ - VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \ - VIR_CONNECT_LIST_DOMAINS_OTHER) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \ - (VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \ - VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \ - (VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \ - VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \ - (VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \ - VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \ - (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT) - -int virDomainObjListCollect(virDomainObjListPtr doms, - virConnectPtr conn, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags); -int virDomainObjListExport(virDomainObjListPtr doms, - virConnectPtr conn, - virDomainPtr **domains, - virDomainObjListACLFilter filter, - unsigned int flags); -int virDomainObjListConvert(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainPtr *doms, - size_t ndoms, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags, - bool skip_missing); - int virDomainDefMaybeAddController(virDomainDefPtr def, int type, diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 6e68ecc..0211861 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -33,7 +33,7 @@ # include "virbuffer.h" # include "virsocketaddr.h" # include "virmacaddr.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" /* XXX * The config parser/structs should not be using platform specific diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c new file mode 100644 index 0000000..7568f93 --- /dev/null +++ b/src/conf/virdomainobjlist.c @@ -0,0 +1,999 @@ +/* + * virdomainobjlist.c: domain objects list utilities + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "internal.h" +#include "datatypes.h" +#include "virdomainobjlist.h" +#include "snapshot_conf.h" +#include "viralloc.h" +#include "virfile.h" +#include "virlog.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_DOMAIN + +VIR_LOG_INIT("conf.virdomainobjlist"); + +static virClassPtr virDomainObjListClass; +static void virDomainObjListDispose(void *obj); + + +struct _virDomainObjList { + virObjectLockable parent; + + /* uuid string -> virDomainObj mapping + * for O(1), lockless lookup-by-uuid */ + virHashTable *objs; + + /* name -> virDomainObj mapping for O(1), + * lockless lookup-by-name */ + virHashTable *objsName; +}; + + +static int virDomainObjListOnceInit(void) +{ + if (!(virDomainObjListClass = virClassNew(virClassForObjectLockable(), + "virDomainObjList", + sizeof(virDomainObjList), + virDomainObjListDispose))) + return -1; + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virDomainObjList) + +virDomainObjListPtr virDomainObjListNew(void) +{ + virDomainObjListPtr doms; + + if (virDomainObjListInitialize() < 0) + return NULL; + + if (!(doms = virObjectLockableNew(virDomainObjListClass))) + return NULL; + + if (!(doms->objs = virHashCreate(50, virObjectFreeHashData)) || + !(doms->objsName = virHashCreate(50, virObjectFreeHashData))) { + virObjectUnref(doms); + return NULL; + } + + return doms; +} + + +static void virDomainObjListDispose(void *obj) +{ + virDomainObjListPtr doms = obj; + + virHashFree(doms->objs); + virHashFree(doms->objsName); +} + + +static int virDomainObjListSearchID(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *data) +{ + virDomainObjPtr obj = (virDomainObjPtr)payload; + const int *id = data; + int want = 0; + + virObjectLock(obj); + if (virDomainObjIsActive(obj) && + obj->def->id == *id) + want = 1; + virObjectUnlock(obj); + return want; +} + + +virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, + int id) +{ + virDomainObjPtr obj; + virObjectLock(doms); + obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id); + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + obj = NULL; + } + } + virObjectUnlock(doms); + return obj; +} + + +static virDomainObjPtr +virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, + const unsigned char *uuid, + bool ref) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virDomainObjPtr obj; + + virObjectLock(doms); + virUUIDFormat(uuid, uuidstr); + + obj = virHashLookup(doms->objs, uuidstr); + if (ref) { + virObjectRef(obj); + virObjectUnlock(doms); + } + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + if (ref) + virObjectUnref(obj); + obj = NULL; + } + } + if (!ref) + virObjectUnlock(doms); + return obj; +} + + +virDomainObjPtr +virDomainObjListFindByUUID(virDomainObjListPtr doms, + const unsigned char *uuid) +{ + return virDomainObjListFindByUUIDInternal(doms, uuid, false); +} + + +virDomainObjPtr +virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, + const unsigned char *uuid) +{ + return virDomainObjListFindByUUIDInternal(doms, uuid, true); +} + + +virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, + const char *name) +{ + virDomainObjPtr obj; + + virObjectLock(doms); + obj = virHashLookup(doms->objsName, name); + virObjectRef(obj); + virObjectUnlock(doms); + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + virObjectUnref(obj); + obj = NULL; + } + } + return obj; +} + + +/* + * virDomainObjListAddLocked: + * + * If flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE then + * this will refuse updating an existing def if the + * current def is Live + * + * If flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE then + * the @def being added is assumed to represent a + * live config, not a future inactive config + * + */ +static virDomainObjPtr +virDomainObjListAddLocked(virDomainObjListPtr doms, + virDomainDefPtr def, + virDomainXMLOptionPtr xmlopt, + unsigned int flags, + virDomainDefPtr *oldDef) +{ + virDomainObjPtr vm; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + if (oldDef) + *oldDef = NULL; + + virUUIDFormat(def->uuid, uuidstr); + + /* See if a VM with matching UUID already exists */ + if ((vm = virHashLookup(doms->objs, uuidstr))) { + virObjectLock(vm); + /* UUID matches, but if names don't match, refuse it */ + if (STRNEQ(vm->def->name, def->name)) { + virUUIDFormat(vm->def->uuid, uuidstr); + virReportError(VIR_ERR_OPERATION_FAILED, + _("domain '%s' is already defined with uuid %s"), + vm->def->name, uuidstr); + goto error; + } + + if (flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE) { + /* UUID & name match, but if VM is already active, refuse it */ + if (virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain '%s' is already active"), + vm->def->name); + goto error; + } + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain '%s' is already being started"), + vm->def->name); + goto error; + } + } + + virDomainObjAssignDef(vm, + def, + !!(flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE), + oldDef); + } else { + /* UUID does not match, but if a name matches, refuse it */ + if ((vm = virHashLookup(doms->objsName, def->name))) { + virObjectLock(vm); + virUUIDFormat(vm->def->uuid, uuidstr); + virReportError(VIR_ERR_OPERATION_FAILED, + _("domain '%s' already exists with uuid %s"), + def->name, uuidstr); + goto error; + } + + if (!(vm = virDomainObjNew(xmlopt))) + goto cleanup; + vm->def = def; + + virUUIDFormat(def->uuid, uuidstr); + if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) { + virObjectUnref(vm); + return NULL; + } + + if (virHashAddEntry(doms->objsName, def->name, vm) < 0) { + virHashRemoveEntry(doms->objs, uuidstr); + return NULL; + } + + /* Since domain is in two hash tables, increment the + * reference counter */ + virObjectRef(vm); + } + cleanup: + return vm; + + error: + virObjectUnlock(vm); + vm = NULL; + goto cleanup; +} + + +virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, + virDomainDefPtr def, + virDomainXMLOptionPtr xmlopt, + unsigned int flags, + virDomainDefPtr *oldDef) +{ + virDomainObjPtr ret; + + virObjectLock(doms); + ret = virDomainObjListAddLocked(doms, def, xmlopt, flags, oldDef); + virObjectUnlock(doms); + return ret; +} + + +int +virDomainObjListRenameAddNew(virDomainObjListPtr doms, + virDomainObjPtr vm, + const char *name) +{ + int ret = -1; + virObjectLock(doms); + + /* Add new name into the hash table of domain names. */ + if (virHashAddEntry(doms->objsName, name, vm) < 0) + goto cleanup; + + /* Okay, this is crazy. virHashAddEntry() does not increment + * the refcounter of @vm, but virHashRemoveEntry() does + * decrement it. We need to work around it. */ + virObjectRef(vm); + + ret = 0; + cleanup: + virObjectUnlock(doms); + return ret; +} + + +int +virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name) +{ + virObjectLock(doms); + virHashRemoveEntry(doms->objsName, name); + virObjectUnlock(doms); + return 0; +} + + +/* + * The caller must hold a lock on the driver owning 'doms', + * and must also have locked 'dom', to ensure no one else + * is either waiting for 'dom' or still using it + */ +void virDomainObjListRemove(virDomainObjListPtr doms, + virDomainObjPtr dom) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + dom->removing = true; + virUUIDFormat(dom->def->uuid, uuidstr); + virObjectRef(dom); + virObjectUnlock(dom); + + virObjectLock(doms); + virObjectLock(dom); + virHashRemoveEntry(doms->objs, uuidstr); + virHashRemoveEntry(doms->objsName, dom->def->name); + virObjectUnlock(dom); + virObjectUnref(dom); + virObjectUnlock(doms); +} + + +/* The caller must hold lock on 'doms' in addition to 'virDomainObjListRemove' + * requirements + * + * Can be used to remove current element while iterating with + * virDomainObjListForEach + */ +void virDomainObjListRemoveLocked(virDomainObjListPtr doms, + virDomainObjPtr dom) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(dom->def->uuid, uuidstr); + + virHashRemoveEntry(doms->objs, uuidstr); + virHashRemoveEntry(doms->objsName, dom->def->name); + virObjectUnlock(dom); +} + + +static virDomainObjPtr +virDomainObjListLoadConfig(virDomainObjListPtr doms, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + const char *configDir, + const char *autostartDir, + const char *name, + virDomainLoadConfigNotify notify, + void *opaque) +{ + char *configFile = NULL, *autostartLink = NULL; + virDomainDefPtr def = NULL; + virDomainObjPtr dom; + int autostart; + virDomainDefPtr oldDef = NULL; + + if ((configFile = virDomainConfigFile(configDir, name)) == NULL) + goto error; + if (!(def = virDomainDefParseFile(configFile, caps, xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) + goto error; + + if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) + goto error; + + if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) + goto error; + + if (!(dom = virDomainObjListAddLocked(doms, def, xmlopt, 0, &oldDef))) + goto error; + + dom->autostart = autostart; + + if (notify) + (*notify)(dom, oldDef == NULL, opaque); + + virDomainDefFree(oldDef); + VIR_FREE(configFile); + VIR_FREE(autostartLink); + return dom; + + error: + VIR_FREE(configFile); + VIR_FREE(autostartLink); + virDomainDefFree(def); + return NULL; +} + + +static virDomainObjPtr +virDomainObjListLoadStatus(virDomainObjListPtr doms, + const char *statusDir, + const char *name, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + virDomainLoadConfigNotify notify, + void *opaque) +{ + char *statusFile = NULL; + virDomainObjPtr obj = NULL; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + if ((statusFile = virDomainConfigFile(statusDir, name)) == NULL) + goto error; + + if (!(obj = virDomainObjParseFile(statusFile, caps, xmlopt, + VIR_DOMAIN_DEF_PARSE_STATUS | + VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | + VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES | + VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) + goto error; + + virUUIDFormat(obj->def->uuid, uuidstr); + + if (virHashLookup(doms->objs, uuidstr) != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected domain %s already exists"), + obj->def->name); + goto error; + } + + if (virHashAddEntry(doms->objs, uuidstr, obj) < 0) + goto error; + + if (virHashAddEntry(doms->objsName, obj->def->name, obj) < 0) { + virHashRemoveEntry(doms->objs, uuidstr); + goto error; + } + + /* Since domain is in two hash tables, increment the + * reference counter */ + virObjectRef(obj); + + if (notify) + (*notify)(obj, 1, opaque); + + VIR_FREE(statusFile); + return obj; + + error: + virObjectUnref(obj); + VIR_FREE(statusFile); + return NULL; +} + + +int +virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, + const char *configDir, + const char *autostartDir, + int liveStatus, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + virDomainLoadConfigNotify notify, + void *opaque) +{ + DIR *dir; + struct dirent *entry; + int ret = -1; + + VIR_INFO("Scanning for configs in %s", configDir); + + if (!(dir = opendir(configDir))) { + if (errno == ENOENT) + return 0; + virReportSystemError(errno, + _("Failed to open dir '%s'"), + configDir); + return -1; + } + + virObjectLock(doms); + + while ((ret = virDirRead(dir, &entry, configDir)) > 0) { + virDomainObjPtr dom; + + if (entry->d_name[0] == '.') + continue; + + if (!virFileStripSuffix(entry->d_name, ".xml")) + continue; + + /* NB: ignoring errors, so one malformed config doesn't + kill the whole process */ + VIR_INFO("Loading config file '%s.xml'", entry->d_name); + if (liveStatus) + dom = virDomainObjListLoadStatus(doms, + configDir, + entry->d_name, + caps, + xmlopt, + notify, + opaque); + else + dom = virDomainObjListLoadConfig(doms, + caps, + xmlopt, + configDir, + autostartDir, + entry->d_name, + notify, + opaque); + if (dom) { + if (!liveStatus) + dom->persistent = 1; + virObjectUnlock(dom); + } + } + + closedir(dir); + virObjectUnlock(doms); + return ret; +} + + +struct virDomainObjListData { + virDomainObjListACLFilter filter; + virConnectPtr conn; + bool active; + int count; +}; + + +static void +virDomainObjListCount(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virDomainObjPtr obj = payload; + struct virDomainObjListData *data = opaque; + virObjectLock(obj); + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + if (virDomainObjIsActive(obj)) { + if (data->active) + data->count++; + } else { + if (!data->active) + data->count++; + } + cleanup: + virObjectUnlock(obj); +} + + +int +virDomainObjListNumOfDomains(virDomainObjListPtr doms, + bool active, + virDomainObjListACLFilter filter, + virConnectPtr conn) +{ + struct virDomainObjListData data = { filter, conn, active, 0 }; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListCount, &data); + virObjectUnlock(doms); + return data.count; +} + + +struct virDomainIDData { + virDomainObjListACLFilter filter; + virConnectPtr conn; + int numids; + int maxids; + int *ids; +}; + + +static void +virDomainObjListCopyActiveIDs(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virDomainObjPtr obj = payload; + struct virDomainIDData *data = opaque; + virObjectLock(obj); + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + if (virDomainObjIsActive(obj) && data->numids < data->maxids) + data->ids[data->numids++] = obj->def->id; + cleanup: + virObjectUnlock(obj); +} + + +int +virDomainObjListGetActiveIDs(virDomainObjListPtr doms, + int *ids, + int maxids, + virDomainObjListACLFilter filter, + virConnectPtr conn) +{ + struct virDomainIDData data = { filter, conn, + 0, maxids, ids }; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListCopyActiveIDs, &data); + virObjectUnlock(doms); + return data.numids; +} + + +struct virDomainNameData { + virDomainObjListACLFilter filter; + virConnectPtr conn; + int oom; + int numnames; + int maxnames; + char **const names; +}; + + +static void +virDomainObjListCopyInactiveNames(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virDomainObjPtr obj = payload; + struct virDomainNameData *data = opaque; + + if (data->oom) + return; + + virObjectLock(obj); + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + if (!virDomainObjIsActive(obj) && data->numnames < data->maxnames) { + if (VIR_STRDUP(data->names[data->numnames], obj->def->name) < 0) + data->oom = 1; + else + data->numnames++; + } + cleanup: + virObjectUnlock(obj); +} + + +int +virDomainObjListGetInactiveNames(virDomainObjListPtr doms, + char **const names, + int maxnames, + virDomainObjListACLFilter filter, + virConnectPtr conn) +{ + struct virDomainNameData data = { filter, conn, + 0, 0, maxnames, names }; + size_t i; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data); + virObjectUnlock(doms); + if (data.oom) { + for (i = 0; i < data.numnames; i++) + VIR_FREE(data.names[i]); + return -1; + } + + return data.numnames; +} + + +struct virDomainListIterData { + virDomainObjListIterator callback; + void *opaque; + int ret; +}; + + +static void +virDomainObjListHelper(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + struct virDomainListIterData *data = opaque; + + if (data->callback(payload, data->opaque) < 0) + data->ret = -1; +} + + +int +virDomainObjListForEach(virDomainObjListPtr doms, + virDomainObjListIterator callback, + void *opaque) +{ + struct virDomainListIterData data = { + callback, opaque, 0, + }; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListHelper, &data); + virObjectUnlock(doms); + return data.ret; +} + + +#define MATCH(FLAG) (filter & (FLAG)) +static bool +virDomainObjMatchFilter(virDomainObjPtr vm, + unsigned int filter) +{ + /* filter by active state */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_ACTIVE) && + virDomainObjIsActive(vm)) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_INACTIVE) && + !virDomainObjIsActive(vm)))) + return false; + + /* filter by persistence */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT) && + vm->persistent) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && + !vm->persistent))) + return false; + + /* filter by domain state */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE)) { + int st = virDomainObjGetState(vm, NULL); + if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_RUNNING) && + st == VIR_DOMAIN_RUNNING) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_PAUSED) && + st == VIR_DOMAIN_PAUSED) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_SHUTOFF) && + st == VIR_DOMAIN_SHUTOFF) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_OTHER) && + (st != VIR_DOMAIN_RUNNING && + st != VIR_DOMAIN_PAUSED && + st != VIR_DOMAIN_SHUTOFF)))) + return false; + } + + /* filter by existence of managed save state */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE) && + vm->hasManagedSave) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) && + !vm->hasManagedSave))) + return false; + + /* filter by autostart option */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_AUTOSTART) && vm->autostart) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) && !vm->autostart))) + return false; + + /* filter by snapshot existence */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { + int nsnap = virDomainSnapshotObjListNum(vm->snapshots, NULL, 0); + if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && nsnap > 0) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) && nsnap <= 0))) + return false; + } + + return true; +} +#undef MATCH + + +struct virDomainListData { + virDomainObjPtr *vms; + size_t nvms; +}; + + +static void +virDomainObjListCollectIterator(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + struct virDomainListData *data = opaque; + + data->vms[data->nvms++] = virObjectRef(payload); +} + + +static void +virDomainObjListFilter(virDomainObjPtr **list, + size_t *nvms, + virConnectPtr conn, + virDomainObjListACLFilter filter, + unsigned int flags) +{ + size_t i = 0; + + while (i < *nvms) { + virDomainObjPtr vm = (*list)[i]; + + virObjectLock(vm); + + /* do not list the object if: + * 1) it's being removed. + * 2) connection does not have ACL to see it + * 3) it doesn't match the filter + */ + if (vm->removing || + (filter && !filter(conn, vm->def)) || + !virDomainObjMatchFilter(vm, flags)) { + virObjectUnlock(vm); + virObjectUnref(vm); + VIR_DELETE_ELEMENT(*list, i, *nvms); + continue; + } + + virObjectUnlock(vm); + i++; + } +} + + +int +virDomainObjListCollect(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags) +{ + struct virDomainListData data = { NULL, 0 }; + + virObjectLock(domlist); + sa_assert(domlist->objs); + if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) { + virObjectUnlock(domlist); + return -1; + } + + virHashForEach(domlist->objs, virDomainObjListCollectIterator, &data); + virObjectUnlock(domlist); + + virDomainObjListFilter(&data.vms, &data.nvms, conn, filter, flags); + + *nvms = data.nvms; + *vms = data.vms; + + return 0; +} + + +int +virDomainObjListConvert(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainPtr *doms, + size_t ndoms, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags, + bool skip_missing) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virDomainObjPtr vm; + size_t i; + + *nvms = 0; + *vms = NULL; + + virObjectLock(domlist); + for (i = 0; i < ndoms; i++) { + virDomainPtr dom = doms[i]; + + virUUIDFormat(dom->uuid, uuidstr); + + if (!(vm = virHashLookup(domlist->objs, uuidstr))) { + if (skip_missing) + continue; + + virObjectUnlock(domlist); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, dom->name); + goto error; + } + + virObjectRef(vm); + + if (VIR_APPEND_ELEMENT(*vms, *nvms, vm) < 0) { + virObjectUnlock(domlist); + virObjectUnref(vm); + goto error; + } + } + virObjectUnlock(domlist); + + sa_assert(*vms); + virDomainObjListFilter(vms, nvms, conn, filter, flags); + + return 0; + + error: + virObjectListFreeCount(*vms, *nvms); + *vms = NULL; + *nvms = 0; + + return -1; +} + + +int +virDomainObjListExport(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainPtr **domains, + virDomainObjListACLFilter filter, + unsigned int flags) +{ + virDomainObjPtr *vms = NULL; + virDomainPtr *doms = NULL; + size_t nvms = 0; + size_t i; + int ret = -1; + + if (virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags) < 0) + return -1; + + if (domains) { + if (VIR_ALLOC_N(doms, nvms + 1) < 0) + goto cleanup; + + for (i = 0; i < nvms; i++) { + virDomainObjPtr vm = vms[i]; + + virObjectLock(vm); + + if (!(doms[i] = virGetDomain(conn, vm->def->name, vm->def->uuid))) { + virObjectUnlock(vm); + goto cleanup; + } + + doms[i]->id = vm->def->id; + + virObjectUnlock(vm); + } + + *domains = doms; + doms = NULL; + } + + ret = nvms; + + cleanup: + virObjectListFree(doms); + virObjectListFreeCount(vms, nvms); + return ret; +} diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h new file mode 100644 index 0000000..f479598 --- /dev/null +++ b/src/conf/virdomainobjlist.h @@ -0,0 +1,151 @@ +/* + * virdomainobjlist.h: domain objects list utilities + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#ifndef __VIRDOMAINOBJLIST_H__ +# define __VIRDOMAINOBJLIST_H__ + +# include "domain_conf.h" + +typedef struct _virDomainObjList virDomainObjList; +typedef virDomainObjList *virDomainObjListPtr; + +virDomainObjListPtr virDomainObjListNew(void); + +virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, + int id); +virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, + const unsigned char *uuid); +virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, + const unsigned char *uuid); +virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, + const char *name); + +enum { + VIR_DOMAIN_OBJ_LIST_ADD_LIVE = (1 << 0), + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE = (1 << 1), +}; +virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, + virDomainDefPtr def, + virDomainXMLOptionPtr xmlopt, + unsigned int flags, + virDomainDefPtr *oldDef); + +int virDomainObjListRenameAddNew(virDomainObjListPtr doms, + virDomainObjPtr vm, + const char *name); +int virDomainObjListRenameRemove(virDomainObjListPtr doms, + const char *name); +void virDomainObjListRemove(virDomainObjListPtr doms, + virDomainObjPtr dom); +void virDomainObjListRemoveLocked(virDomainObjListPtr doms, + virDomainObjPtr dom); + +int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, + const char *configDir, + const char *autostartDir, + int liveStatus, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + virDomainLoadConfigNotify notify, + void *opaque); + +int virDomainObjListNumOfDomains(virDomainObjListPtr doms, + bool active, + virDomainObjListACLFilter filter, + virConnectPtr conn); + +int virDomainObjListGetActiveIDs(virDomainObjListPtr doms, + int *ids, + int maxids, + virDomainObjListACLFilter filter, + virConnectPtr conn); +int virDomainObjListGetInactiveNames(virDomainObjListPtr doms, + char **const names, + int maxnames, + virDomainObjListACLFilter filter, + virConnectPtr conn); + +typedef int (*virDomainObjListIterator)(virDomainObjPtr dom, + void *opaque); + +int virDomainObjListForEach(virDomainObjListPtr doms, + virDomainObjListIterator callback, + void *opaque); + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \ + (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \ + VIR_CONNECT_LIST_DOMAINS_INACTIVE) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \ + (VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \ + VIR_CONNECT_LIST_DOMAINS_TRANSIENT) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \ + (VIR_CONNECT_LIST_DOMAINS_RUNNING | \ + VIR_CONNECT_LIST_DOMAINS_PAUSED | \ + VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \ + VIR_CONNECT_LIST_DOMAINS_OTHER) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \ + (VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \ + VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \ + (VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \ + VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \ + (VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \ + VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \ + (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT) + +int virDomainObjListCollect(virDomainObjListPtr doms, + virConnectPtr conn, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags); +int virDomainObjListExport(virDomainObjListPtr doms, + virConnectPtr conn, + virDomainPtr **domains, + virDomainObjListACLFilter filter, + unsigned int flags); +int virDomainObjListConvert(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainPtr *doms, + size_t ndoms, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags, + bool skip_missing); + +#endif /* __VIRDOMAINOBJLIST_H__ */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5944947..ebf23be 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -24,7 +24,7 @@ #include <config.h> #include "internal.h" -#include "domain_conf.h" +#include "virdomainobjlist.h" #include "snapshot_conf.h" #include "virauth.h" #include "viralloc.h" diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 1958bbe..083e62a 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -24,7 +24,7 @@ #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomainobjlist.h" #include "virauth.h" #include "viralloc.h" #include "virlog.h" diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7e60d87..5f2006b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -396,24 +396,6 @@ virDomainObjGetMetadata; virDomainObjGetOneDef; virDomainObjGetPersistentDef; virDomainObjGetState; -virDomainObjListAdd; -virDomainObjListCollect; -virDomainObjListConvert; -virDomainObjListExport; -virDomainObjListFindByID; -virDomainObjListFindByName; -virDomainObjListFindByUUID; -virDomainObjListFindByUUIDRef; -virDomainObjListForEach; -virDomainObjListGetActiveIDs; -virDomainObjListGetInactiveNames; -virDomainObjListLoadAllConfigs; -virDomainObjListNew; -virDomainObjListNumOfDomains; -virDomainObjListRemove; -virDomainObjListRemoveLocked; -virDomainObjListRenameAddNew; -virDomainObjListRenameRemove; virDomainObjNew; virDomainObjParseNode; virDomainObjSetDefTransient; @@ -885,6 +867,27 @@ virChrdevFree; virChrdevOpen; +# conf/virdomainobjlist.h +virDomainObjListAdd; +virDomainObjListCollect; +virDomainObjListConvert; +virDomainObjListExport; +virDomainObjListFindByID; +virDomainObjListFindByName; +virDomainObjListFindByUUID; +virDomainObjListFindByUUIDRef; +virDomainObjListForEach; +virDomainObjListGetActiveIDs; +virDomainObjListGetInactiveNames; +virDomainObjListLoadAllConfigs; +virDomainObjListNew; +virDomainObjListNumOfDomains; +virDomainObjListRemove; +virDomainObjListRemoveLocked; +virDomainObjListRenameAddNew; +virDomainObjListRenameRemove; + + # cpu/cpu.h cpuBaseline; cpuBaselineXML; diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 9c29b1e..7c68b2b 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -30,7 +30,7 @@ # include "internal.h" # include "libvirt_internal.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "domain_event.h" # include "capabilities.h" # include "configmake.h" diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index a5c5806..fc36740 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -30,7 +30,7 @@ # define OPENVZ_CONF_H # include "internal.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "virthread.h" diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 9ccd567..3b27396 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -60,6 +60,7 @@ #include "cpu/cpu.h" #include "virauth.h" #include "viratomic.h" +#include "virdomainobjlist.h" #define VIR_FROM_THIS VIR_FROM_TEST diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index 05e19ff..9a45d10 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -28,7 +28,7 @@ # include "libvirt_internal.h" # include "capabilities.h" # include "network_conf.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "domain_event.h" # include "virerror.h" # include "virthread.h" diff --git a/src/util/virclosecallbacks.h b/src/util/virclosecallbacks.h index e6b8a9e..4df0a00 100644 --- a/src/util/virclosecallbacks.h +++ b/src/util/virclosecallbacks.h @@ -25,7 +25,7 @@ #ifndef __VIR_CLOSE_CALLBACKS__ # define __VIR_CLOSE_CALLBACKS__ -# include "domain_conf.h" +# include "virdomainobjlist.h" typedef struct _virCloseCallbacks virCloseCallbacks; typedef virCloseCallbacks *virCloseCallbacksPtr; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 3e6ed7a..5ed6d93 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -25,7 +25,7 @@ #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomainobjlist.h" #include "domain_event.h" #include "virlog.h" #include "viralloc.h" diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index 1f3c41a..b3f8cdf 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -26,7 +26,7 @@ # define NOGUI "nogui" # include "internal.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "virthread.h" # define VIR_FROM_THIS VIR_FROM_VMWARE diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 84cf08f..b7a4c81 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -27,6 +27,7 @@ # include "driver.h" # include "conf/domain_conf.h" +# include "conf/virdomainobjlist.h" # include "conf/domain_event.h" # include "virthread.h" diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index d4e500b..abc18e5 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -32,7 +32,7 @@ #include <libxml/xmlsave.h> #include "internal.h" -#include "conf/domain_conf.h" +#include "conf/virdomainobjlist.h" #include "intprops.h" #include "viralloc.h" #include "virmacaddr.h" -- 2.4.10

2 2

[libvirt] [PATCH v3 00/11] Introduce virt-admin client
by Erik Skultety 30 Nov '15

30 Nov '15

v1: 1/9 - ACKed if adjusted 6/9 - ACKed 8/9 - ACKed if squashed into 4/9 --> resolves 7/9 v2: - double empty line in private.syms is preserved (1/9) - adjusted authors of virt-admin modules (2/9) - removed unnecessary includes from virt-admin module (2/9) - replaced "int" disconnected type for type "bool" (2/9) - dropped unused command groups (2/9) - removed unnecessary flags and adminControl struct element (2/9) - introduction of virAdmConnectIsAlive split separately (3/9) - remote version of admin API moved into a separate module (4/9) - updated admin_protocol-structs (8/9) - removed debugging leftovers from gendispatch.pl (8/9) - properly indented if-else conditions in gendispatch.pl (8/9) - removed unrelated paragraph, domain references, unsupported options from virt-admin.pod and command 'connect' is now (hopefully correctly) documented (9/9) - introduction of vshAdmCatchDisconnect and introduction of close callbacks had to be squashed together due to dependencies both ways <-- review 4/9 pointed out dummy NULL close callback which should be replaced by something relevant since v2: 1/9 - ACKed if virGetLibvirtConfigFile is renamed 3/9 - ACKed, 'disconnected' removed, replaced by virAdmConnectIsAlive 4/9 - ACKed, admin_remote.c include moved up 5/9 - ACKed v3: - adjusted formatting issues (missing/extra whitespaces, missaligned tabs) - fixed dual assignment in virAdmConnectOpen - cleaned some of the 'bogus' in vshAdmShowVersion - fixed the logic in getSocketPath - fixed coverity issues - virt-admin -h behaves the same as --help - virGetEnvBlockSUID replaced by virGetEnvAllowSUID - changed the prefix for default admin URI - close callback disposal now takes NULL for all relevant arguments - Makefile: simplified man page pattern rule - Makefile: fixed virt-admin recipes - Man: reworded or deleted suggested parts - proposed URI aliases support Erik Skultety (11): libvirt: Export libvirt config getters by moving them to util virt-admin: Introduce first working skeleton admin: Introduce virAdmConnectIsAlive admin: Move remote admin API version to a separate module admin: Do not generate remoteAdminConnect{Open,Close} admin: Add URI support and introduce virAdmGetDefaultURI livirt: Move URI alias matching to util admin: Add support for URI aliases admin: Add support for connection close callbacks admin: Introduce virAdmConnectGetLibVersion virt-admin: Provide a man page for virt-admin .gitignore | 1 + cfg.mk | 2 +- daemon/admin_server.c | 9 + include/libvirt/libvirt-admin.h | 27 ++ po/POTFILES.in | 2 + src/admin/admin_protocol.x | 15 +- src/admin/admin_remote.c | 216 ++++++++++++ src/admin_protocol-structs | 4 + src/datatypes.c | 26 ++ src/datatypes.h | 17 +- src/libvirt-admin.c | 423 ++++++++++++++++-------- src/libvirt.c | 133 +------- src/libvirt.conf | 7 +- src/libvirt_admin_private.syms | 1 + src/libvirt_admin_public.syms | 5 + src/libvirt_private.syms | 2 + src/rpc/gendispatch.pl | 11 +- src/util/virconf.c | 52 +++ src/util/virconf.h | 1 + src/util/viruri.c | 92 ++++++ src/util/viruri.h | 2 + tools/Makefile.am | 38 ++- tools/virt-admin.c | 712 ++++++++++++++++++++++++++++++++++++++++ tools/virt-admin.h | 46 +++ tools/virt-admin.pod | 255 ++++++++++++++ 25 files changed, 1801 insertions(+), 298 deletions(-) create mode 100644 src/admin/admin_remote.c create mode 100644 tools/virt-admin.c create mode 100644 tools/virt-admin.h create mode 100644 tools/virt-admin.pod -- 2.4.3

4 35

[libvirt] libvirt-php 0.5.1 broken build on RHEL-7
by Remi Collet 30 Nov '15

30 Nov '15

RHEL 7 have libvirt 1.2.8 which is the minimum version according to configure check LIBVIRT_REQUIRED=1.2.8 libvirt-php.c: In function 'zm_startup_libvirt': libvirt-php.c:1351:136: error: 'VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES' undeclared (first use in this function) REGISTER_LONG_CONSTANT("VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES", VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES, CONST_CS | CONST_PERSISTENT); Remi

2 1

[libvirt] libvirt external snapshot error
by Vasiliy Tolstov 30 Nov '15

30 Nov '15

Hi, i'm using virsh -c qemu+ssh://test.node/system snapshot-create-as 40083 --no-metadata --disk-only --live –atomic --diskspec sda,file=/test outputs: error: Operation not supported: live snapshot creation is supported only with external checkpoints info: Compiled against library: libvirt 1.2.16 Using library: libvirt 1.2.16 Using API: QEMU 1.2.16 Running hypervisor: QEMU 2.4.1 Does it supported on never libvirt? How can i solve the issue? I'm use raw format for disk. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 9

[libvirt] [PATCH] virlogd: fix crash if log file exists and it's larger the maxlen
by Pavel Hrdina 30 Nov '15

30 Nov '15

If for some reason there is an existing log file, that is larger then max length of log file, we need to rollover that file immediately. Trying to figure out how much data we could write will resolve in overflow of unsigned variable 'towrite' and this leads to segfault. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virrotatingfile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 1260710..827b44b 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -443,7 +443,12 @@ virRotatingFileWriterAppend(virRotatingFileWriterPtr file, size_t towrite = len; bool forceRollover = false; - if ((file->entry->pos + towrite) > file->maxlen) { + if (file->entry->pos > file->maxlen) { + /* If existing file is for some reason larger then max length we + * won't write to this file anymore, but we rollover this file.*/ + forceRollover = true; + towrite = 0; + } else if ((file->entry->pos + towrite) > file->maxlen) { towrite = file->maxlen - file->entry->pos; /* -- 2.6.3

2 2

[libvirt] libprl_sdk.so.7 library dependancies
by Daniel P. Berrange 28 Nov '15

28 Nov '15

In debugging some recent problem I was rather surprised to find that libvirt.so was linked against Qt, X11 and GObject. It turns out that this is due to the VZ driver linking to libprl_sdk.so which pulls in all these libs: $ ldd /usr/lib64/libprl_sdk.so.7.0.26 linux-vdso.so.1 (0x00007fff443d3000) libz.so.1 => /usr/lib64/libz.so.1 (0x00007f4f8f415000) libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f4f8f210000) librt.so.1 => /usr/lib64/librt.so.1 (0x00007f4f8f008000) libQtXml.so.4 => /usr/lib64/libQtXml.so.4 (0x00007f4f8edc1000) libQtGui.so.4 => /usr/lib64/libQtGui.so.4 (0x00007f4f8e087000) libQtNetwork.so.4 => /usr/lib64/libQtNetwork.so.4 (0x00007f4f8dd33000) libQtCore.so.4 => /usr/lib64/libQtCore.so.4 (0x00007f4f8d82c000) libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f4f8d60e000) libXext.so.6 => /usr/lib64/libXext.so.6 (0x00007f4f8d3fc000) libX11.so.6 => /usr/lib64/libX11.so.6 (0x00007f4f8d0bc000) libstdc++.so.6 => /usr/lib64/libstdc++.so.6 (0x00007f4f8cd39000) libm.so.6 => /usr/lib64/libm.so.6 (0x00007f4f8ca37000) libgcc_s.so.1 => /usr/lib64/libgcc_s.so.1 (0x00007f4f8c820000) libc.so.6 => /usr/lib64/libc.so.6 (0x00007f4f8c45e000) /lib64/ld-linux-x86-64.so.2 (0x000055817de34000) libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f4f8c25c000) libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f4f8bf23000) libpng16.so.16 => /usr/lib64/libpng16.so.16 (0x00007f4f8bcef000) libfreetype.so.6 => /usr/lib64/libfreetype.so.6 (0x00007f4f8ba45000) libgobject-2.0.so.0 => /usr/lib64/libgobject-2.0.so.0 (0x00007f4f8b7f3000) libSM.so.6 => /usr/lib64/libSM.so.6 (0x00007f4f8b5e9000) libICE.so.6 => /usr/lib64/libICE.so.6 (0x00007f4f8b3cd000) libXi.so.6 => /usr/lib64/libXi.so.6 (0x00007f4f8b1bd000) libXrender.so.1 => /usr/lib64/libXrender.so.1 (0x00007f4f8afb1000) libXrandr.so.2 => /usr/lib64/libXrandr.so.2 (0x00007f4f8ada6000) libXfixes.so.3 => /usr/lib64/libXfixes.so.3 (0x00007f4f8aba0000) libXcursor.so.1 => /usr/lib64/libXcursor.so.1 (0x00007f4f8a994000) libXinerama.so.1 => /usr/lib64/libXinerama.so.1 (0x00007f4f8a791000) libfontconfig.so.1 => /usr/lib64/libfontconfig.so.1 (0x00007f4f8a54d000) libssl.so.10 => /usr/lib64/libssl.so.10 (0x00007f4f8a2d3000) libcrypto.so.10 => /usr/lib64/libcrypto.so.10 (0x00007f4f89e86000) libxcb.so.1 => /usr/lib64/libxcb.so.1 (0x00007f4f89c63000) libbz2.so.1 => /usr/lib64/libbz2.so.1 (0x00007f4f89a53000) libffi.so.6 => /usr/lib64/libffi.so.6 (0x00007f4f8984a000) libuuid.so.1 => /usr/lib64/libuuid.so.1 (0x00007f4f89645000) libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f4f8941a000) libgssapi_krb5.so.2 => /usr/lib64/libgssapi_krb5.so.2 (0x00007f4f891cc000) libkrb5.so.3 => /usr/lib64/libkrb5.so.3 (0x00007f4f88ee7000) libcom_err.so.2 => /usr/lib64/libcom_err.so.2 (0x00007f4f88ce2000) libk5crypto.so.3 => /usr/lib64/libk5crypto.so.3 (0x00007f4f88ab0000) libXau.so.6 => /usr/lib64/libXau.so.6 (0x00007f4f888ac000) libkrb5support.so.0 => /usr/lib64/libkrb5support.so.0 (0x00007f4f8869c000) libkeyutils.so.1 => /usr/lib64/libkeyutils.so.1 (0x00007f4f88498000) libresolv.so.2 => /usr/lib64/libresolv.so.2 (0x00007f4f8827d000) libselinux.so.1 => /usr/lib64/libselinux.so.1 (0x00007f4f88059000) libpcre.so.1 => /usr/lib64/libpcre.so.1 (0x00007f4f87de9000) This is bad for several reasons - libvirt should not pull in any GUI libraries at all, since virt hosts typically want to avoid any deps on this kind of packages in order to get a minimal hypervisor node install. Second, with libgobject in particular, this library abort()s when it hits out of memory conditions. This is absolutely against the policy of libvirt.so which is that we must feed all errors back to the caller and *never* abort a program using libvirt.so Since it is not in Fedora, I'm using libprlsdk.so from an RPM I built myself - libprlsdk-7.0.26-1.fc22.x86_64. So possibly this is just a mistake in the way I built the library ? If this long list of deps is normal / expected though, then we have a much bigger problem that I don't think we can solve in libvirt. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 5

[libvirt] [PATCH] systemd: Escape only needed characters for machined
by Martin Kletzander 27 Nov '15

27 Nov '15

My previous fix in commit e24eda48cfae84a9003456b68eaf753a26123639 was incomplete, or rather more complete than it needed to be. The problem is that even though machined requires non-ASCII characters to be escaped does not mean that it needs to follow the exact same rules as unit files and services, therefore rendering our escape function, namely virSystemdEscapeName(), as overkill. Well, that should not be a problem, because if we escape more than needed, it will not break anything. However, that is not the case with current release of systemd because even though it requires some characters to be escaped, *any* escaped character will cause the function to fail. Even though that will be fixed, we need to make sure that machines, which were able to start before the commit mentioned above, are still able to start now. So this patch changes virSystemdEscapeName() to operate as the aforementioned overkill merely based on its new parameter. If that parameter is false, which only occurs in the latest call to this function from virSystemdMakeMachineName(), it will not escape characters that would cause the machine being unable to be started. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1282846 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virsystemd.c | 15 ++++++++------- tests/virsystemdtest.c | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index abd883c73844..257efaab7829 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -39,7 +39,8 @@ VIR_LOG_INIT("util.systemd"); static void virSystemdEscapeName(virBufferPtr buf, - const char *name) + const char *name, + bool full_escape) { static const char hextable[16] = "0123456789abcdef"; @@ -57,7 +58,7 @@ static void virSystemdEscapeName(virBufferPtr buf, "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ ":-_.\\" - if (*name == '.') { + if (full_escape && *name == '.') { ESCAPE(*name); name++; } @@ -65,7 +66,7 @@ static void virSystemdEscapeName(virBufferPtr buf, while (*name) { if (*name == '/') virBufferAddChar(buf, '-'); - else if (*name == '-' || + else if ((full_escape && *name == '-') || *name == '\\' || !strchr(VALID_CHARS, *name)) ESCAPE(*name); @@ -85,9 +86,9 @@ char *virSystemdMakeScopeName(const char *name, virBuffer buf = VIR_BUFFER_INITIALIZER; virBufferAddLit(&buf, "machine-"); - virSystemdEscapeName(&buf, drivername); + virSystemdEscapeName(&buf, drivername, true); virBufferAddLit(&buf, "\\x2d"); - virSystemdEscapeName(&buf, name); + virSystemdEscapeName(&buf, name, true); virBufferAddLit(&buf, ".scope"); if (virBufferCheckError(&buf) < 0) @@ -104,7 +105,7 @@ char *virSystemdMakeSliceName(const char *partition) if (*partition == '/') partition++; - virSystemdEscapeName(&buf, partition); + virSystemdEscapeName(&buf, partition, true); virBufferAddLit(&buf, ".slice"); if (virBufferCheckError(&buf) < 0) @@ -130,7 +131,7 @@ char *virSystemdMakeMachineName(const char *name, virBufferAsprintf(&buf, "%s-%s-", username, drivername); } - virSystemdEscapeName(&buf, name); + virSystemdEscapeName(&buf, name, false); machinename = virBufferContentAndReset(&buf); cleanup: diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 06fec5495bc2..49d37c2032ec 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -517,9 +517,9 @@ mymain(void) } while (0) TEST_MACHINE("demo", "qemu-demo"); - TEST_MACHINE("demo-name", "qemu-demo\\x2dname"); + TEST_MACHINE("demo-name", "qemu-demo-name"); TEST_MACHINE("demo!name", "qemu-demo\\x21name"); - TEST_MACHINE(".demo", "qemu-\\x2edemo"); + TEST_MACHINE(".demo", "qemu-.demo"); TEST_MACHINE("bull\U0001f4a9", "qemu-bull\\xf0\\x9f\\x92\\xa9"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ -- 2.6.3

2 2

[libvirt] Plans for next releases
by Daniel Veillard 27 Nov '15

27 Nov '15

Seems I forgot to send that mail earlier. I think we should enter freeze now is we want to push on the next week (and I'm away travelling 3-7 unlikely to have much time on this. If I can freeze now I can try to push 1.3.0 on Wed 2nd, otherwise we would have to wait Tuesday 8. On the other hand usually Dec and Jan are relatively low traffic and I end up doing one release mid-january and the forlowing one end of Feb, so delaying 1.3.0 a little bit may not be a bad idea. Also make dist is broken right now :) make[2]: Entering directory '/home/veillard/libvirt/src' make[2]: *** No rule to make target 'logging/libvirt_logd.aug', needed by 'distdir'. Stop. make[2]: Leaving directory '/home/veillard/libvirt/src' Makefile:2100: recipe for target 'distdir' failed What about a freeze on Wed 3 with a release on Tuesday 8 for 1.3.0 then 1.3.1 mid january and 1.3.2 end of Feb ? thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] logging: remove reference to non-existent augeas files
by Daniel P. Berrange 27 Nov '15

27 Nov '15

The libvirt_logd.aug and test_libvirt_logd.aug.in files have never existed so shouldn't be in EXTRA_DIST. It was a copy+paste mistake when closing virtlogd from virtlockd Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a "make dist" build-fix src/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3c98c38..52552fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2464,9 +2464,7 @@ EXTRA_DIST += \ locking/lockd.conf \ locking/libvirt_lockd.aug \ locking/test_libvirt_lockd.aug.in \ - logging/virtlogd.sysconf \ - logging/libvirt_logd.aug \ - logging/test_libvirt_logd.aug.in + logging/virtlogd.sysconf install-sysconfig: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- 2.5.0

1 0

[libvirt] [PATCH v2] virtlogd: Fix build without DBus
by Martin Kletzander 27 Nov '15

27 Nov '15

The rule for virrotatingfiletest was defined in DBUS-only block even though the test does not use DBus at all. Also DBUS_CFLAGS and DBUS_LIBS are removed from the rules. The original error was: /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/../../../../lib64/Scrt1.o: In function `_start': (.text+0x20): undefined reference to `main' Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b449286f1fb3..e1e28eca93f1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1062,6 +1062,11 @@ virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \ ../src/libvirt.la virnetdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +virrotatingfiletest_SOURCES = \ + virrotatingfiletest.c testutils.h testutils.c +virrotatingfiletest_CFLAGS = $(AM_CFLAGS) +virrotatingfiletest_LDADD = $(LDADDS) + if WITH_LINUX virusbtest_SOURCES = \ virusbtest.c testutils.h testutils.c @@ -1101,11 +1106,6 @@ virpolkittest_SOURCES = \ virpolkittest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virpolkittest_LDADD = $(LDADDS) $(DBUS_LIBS) -virrotatingfiletest_SOURCES = \ - virrotatingfiletest.c testutils.h testutils.c -virrotatingfiletest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -virrotatingfiletest_LDADD = $(LDADDS) $(DBUS_LIBS) - virsystemdtest_SOURCES = \ virsystemdtest.c testutils.h testutils.c virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -- 2.6.3

2 1

[libvirt] [PATCH 00/34] Prepare for specific vcpu hot(un)plug - part 1
by Peter Krempa 27 Nov '15

27 Nov '15

This series is getting rather big. The target is to refactor the way libvirt stores info about vCPUs into a single structure (okay, two structures for the qemu driver. Part 1 is not yet completely there, well, not even halfway. Future work will involve fully allocating priv->vcpupids to the maxcpus size and moving around few other bits of data in cputune and other parts to the new structure. Yet another follow up work is then to add new APIs for vCPU hotplug, which will enable adding vCPUs sparsely (useful if you have NUMA). Since this refactor will result in tracking all vcpu-related data in one struct, the result will automagically fix a few bugs where we'd end up with invalid config after vcpu unplug or other operations. The changes can also be fetched at: git fetch git://pipo.sk/pipo/libvirt.git vcpu-refactor-part-1 Peter Krempa (34): hyperv: Allocate 'def' via virDomainDefNew openvz: Refactor extraction of vcpu count phyp: Refactor extraction of vcpu count xenapi: Refactor extraction of vcpu count conf: Use local copy of maxvcpus in virDomainVcpuParse conf: Drop useless check when parsing cpu scheduler info conf: Replace writes to def->maxvcpus with accessor conf: Extract update of vcpu count if maxvcpus is decreased conf: Add helper to check whether domain has offline vCPUs conf: Assume at least 1 maximum and current vCPU for every conf conf: Replace read access to def->maxvcpus with accessor conf: Replace writes to def->vcpus with accessor conf: Move vcpu count check into helper conf: Replace read accesses to def->vcpus with accessor conf: Turn def->maxvcpus into size_t qemu: domain: Add helper to access vm->privateData->agent qemu: Extract vCPU onlining/offlining via agent into a separate function qemu: qemuDomainSetVcpusAgent: re-check agent before calling it the again qemu: Split up vCPU hotplug and hotunplug qemu: cpu hotplug: Fix error handling logic qemu: monitor: Explain logic of qemuMonitorGetCPUInfo qemu: monitor: Remove weird return values from qemuMonitorSetCPU qemu: cpu hotplug: Move loops to qemuDomainSetVcpusFlags qemu: Refactor qemuDomainHotplugVcpus qemu: refactor qemuDomainHotunplugVcpus conf: turn def->vcpus into a structure conf: ABI: Split up and improve vcpu info ABI checking conf: Add helper to get pointer to a certain vCPU definition qemu: cgroup: Remove now unreachable check qemu: Drop checking vcpu threads in emulator bandwidth getter/setter qemu: Replace checking for vcpu<->pid mapping availability with a helper qemu: Add helper to retrieve vCPU pid qemu: driver: Refactor qemuDomainHelperGetVcpus qemu: cgroup: Don't use priv->ncpupids to iterate domain vCPUs src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 207 ++++++++++++++--- src/conf/domain_conf.h | 22 +- src/hyperv/hyperv_driver.c | 12 +- src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 6 +- src/libxl/libxl_driver.c | 38 +-- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_native.c | 5 - src/openvz/openvz_conf.c | 14 +- src/openvz/openvz_driver.c | 31 +-- src/phyp/phyp_driver.c | 15 +- src/qemu/qemu_cgroup.c | 42 ++-- src/qemu/qemu_command.c | 25 +- src/qemu/qemu_domain.c | 47 ++++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 538 ++++++++++++++++++++++--------------------- src/qemu/qemu_monitor.c | 9 + src/qemu/qemu_monitor_json.c | 4 - src/qemu/qemu_monitor_text.c | 22 +- src/qemu/qemu_process.c | 22 +- src/test/test_driver.c | 38 +-- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 19 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 34 +-- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 9 +- src/xen/xm_internal.c | 19 +- src/xenapi/xenapi_driver.c | 11 +- src/xenapi/xenapi_utils.c | 6 +- src/xenconfig/xen_common.c | 16 +- src/xenconfig/xen_sxpr.c | 26 ++- tests/openvzutilstest.c | 2 +- 35 files changed, 783 insertions(+), 478 deletions(-) -- 2.6.2

2 73

[libvirt] [PATCH] virtlogd: Fix build without DBus
by Martin Kletzander 27 Nov '15

27 Nov '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b449286f1fb3..e2fb3b7f3b67 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -172,7 +172,6 @@ test_programs = virshtest sockettest \ virkeycodetest \ virlockspacetest \ virlogtest \ - virrotatingfiletest \ virstringtest \ virportallocatortest \ sysinfotest \ @@ -210,6 +209,7 @@ endif WITH_LIBVIRTD if WITH_DBUS test_programs += virdbustest \ virsystemdtest \ + virrotatingfiletest \ $(NULL) if WITH_POLKIT1 test_programs += virpolkittest @@ -1112,7 +1112,9 @@ virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD = $(LDADDS) $(DBUS_LIBS) else ! WITH_DBUS -EXTRA_DIST += virdbustest.c virmockdbus.c virsystemdtest.c +EXTRA_DIST += \ + virdbustest.c virmockdbus.c \ + virsystemdtest.c virrotatingfiletest.c endif ! WITH_DBUS viruritest_SOURCES = \ -- 2.6.3

2 2

[libvirt] [PATCH] logging: avoid variables called 'daemon' due to function clash
by Daniel P. Berrange 27 Nov '15

27 Nov '15

With some versions of GLibC / GCC, a variable called 'daemon' will result in a warning about clashing with the function also named 'daemon'. Rename it to 'dmn' to avoid the clash. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a broken build fix. src/logging/log_daemon.c | 10 +++++----- src/logging/log_daemon.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 3fda9ca..6da5876 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -127,12 +127,12 @@ virLogDaemonFree(virLogDaemonPtr logd) static void virLogDaemonInhibitor(bool inhibit, void *opaque) { - virLogDaemonPtr daemon = opaque; + virLogDaemonPtr dmn = opaque; if (inhibit) - virNetDaemonAddShutdownInhibition(daemon->dmn); + virNetDaemonAddShutdownInhibition(dmn->dmn); else - virNetDaemonRemoveShutdownInhibition(daemon->dmn); + virNetDaemonRemoveShutdownInhibition(dmn->dmn); } static virLogDaemonPtr @@ -177,9 +177,9 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) virLogHandlerPtr -virLogDaemonGetHandler(virLogDaemonPtr daemon) +virLogDaemonGetHandler(virLogDaemonPtr dmn) { - return daemon->handler; + return dmn->handler; } diff --git a/src/logging/log_daemon.h b/src/logging/log_daemon.h index b076a4f..8d55bb2 100644 --- a/src/logging/log_daemon.h +++ b/src/logging/log_daemon.h @@ -40,6 +40,6 @@ struct _virLogDaemonClient { extern virLogDaemonPtr logDaemon; -virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr daemon); +virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr dmn); #endif /* __VIR_LOG_DAEMON_H__ */ -- 2.5.0

1 0

[libvirt] [PATCH] virtlogd: Rename variable shadowing global declaration
by Martin Kletzander 27 Nov '15

27 Nov '15

This time the winner is variable named 'daemon'. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/logging/log_daemon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 3fda9ca33c61..cc0559d7ff7b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -127,12 +127,12 @@ virLogDaemonFree(virLogDaemonPtr logd) static void virLogDaemonInhibitor(bool inhibit, void *opaque) { - virLogDaemonPtr daemon = opaque; + virLogDaemonPtr logdmn = opaque; if (inhibit) - virNetDaemonAddShutdownInhibition(daemon->dmn); + virNetDaemonAddShutdownInhibition(logdmn->dmn); else - virNetDaemonRemoveShutdownInhibition(daemon->dmn); + virNetDaemonRemoveShutdownInhibition(logdmn->dmn); } static virLogDaemonPtr @@ -177,9 +177,9 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) virLogHandlerPtr -virLogDaemonGetHandler(virLogDaemonPtr daemon) +virLogDaemonGetHandler(virLogDaemonPtr logdmn) { - return daemon->handler; + return logdmn->handler; } -- 2.6.3

2 1

[libvirt] libvirt-php 0.5.1 uneeded files
by Remi Collet 27 Nov '15

27 Nov '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Installing the new 0.5.1 version: libvirt-php.la libvirt-php.so -> libvirt-php.so.0.0.0 libvirt-php.so.0 -> libvirt-php.so.0.0.0 libvirt-php.so.0.0.0 This is not a versioned library but a PHP extension so having those have no sense. Only libvirt-php.so is needed. Notice: I think it will be simpler to switch to the standard PHP extension build system (phpize; configure; make) Especially, this will allow to use the --with-php-config option (an thus, build for not standard PHP, e.g. TS build or SCL build) Remi. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlZYFIAACgkQYUppBSnxahgqCACg1pGNreKPBVqexNK5yH2VhbRb ZjUAnAuEIl14rIha7Ak70Vzh4LvLSPGy =CFD6 -----END PGP SIGNATURE-----

1 0

[libvirt] [PATCH] virtlogd: use PRIu64 to print 64bit types
by Guido Günther 27 Nov '15

27 Nov '15

Otherwise we fail on 32bit with: CC logging/virtlogd-log_daemon_dispatch.o logging/log_daemon_dispatch.c: In function 'virLogManagerProtocolDispatchDomainReadLogFile': logging/log_daemon_dispatch.c:120:9: error: format '%zu' expects argument of type 'size_t', but argument 7 has type 'uint64_t' [-Werror=format] --- src/logging/log_daemon_dispatch.c | 3 ++- tests/virrotatingfiletest.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c index 269255a..7391a6f 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -21,6 +21,7 @@ */ #include <config.h> +#include <inttypes.h> #include "rpc/virnetserver.h" #include "rpc/virnetserverclient.h" @@ -118,7 +119,7 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_ if (args->maxlen > VIR_LOG_MANAGER_PROTOCOL_STRING_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Requested data len %zu is larger than maximum %d"), + _("Requested data len %"PRIu64" is larger than maximum %d"), args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX); goto cleanup; } diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c index ed55e63..73f0c26 100644 --- a/tests/virrotatingfiletest.c +++ b/tests/virrotatingfiletest.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <unistd.h> #include <fcntl.h> +#include <inttypes.h> #include "virrotatingfile.h" #include "virlog.h" @@ -57,7 +58,8 @@ static int testRotatingFileWriterAssertOneFileSize(const char *filename, fprintf(stderr, "File %s should not exist\n", filename); return -1; } else if (sb.st_size != size) { - fprintf(stderr, "File %s should be %zu bytes not %zu\n", + fprintf(stderr, "File %s should be %" PRIu64 + " bytes not %" PRIu64 "\n", filename, size, sb.st_size); return -1; } else { -- 2.6.2

2 6

[libvirt] [PATCH] virtlogd: cast maxlen to size_t
by Guido Günther 27 Nov '15

27 Nov '15

Otherwise we fail on 32bit with: CC logging/virtlogd-log_daemon_dispatch.o logging/log_daemon_dispatch.c: In function 'virLogManagerProtocolDispatchDomainReadLogFile': logging/log_daemon_dispatch.c:120:9: error: format '%zu' expects argument of type 'size_t', but argument 7 has type 'uint64_t' [-Werror=format] --- src/logging/log_daemon_dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c index 269255a..70b5f1d 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -119,7 +119,7 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_ if (args->maxlen > VIR_LOG_MANAGER_PROTOCOL_STRING_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Requested data len %zu is larger than maximum %d"), - args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX); + (size_t)args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX); goto cleanup; } -- 2.6.2

2 2

[libvirt] [libvirt-glib v5] gobject: Port to GTask API
by Zeeshan Ali (Khattak) 27 Nov '15

27 Nov '15

Drop usage of deprecated GSimpleAsyncResult API. --- v5: * Plug some GError leaks. * Drop StoragePoolBuildData in favour of GUINT_TO_POINTER/GPOINTER_TO_UINT. * Don't unref GTask before using it later in idle callback. libvirt-gobject/libvirt-gobject-domain.c | 290 +++++++++-------------- libvirt-gobject/libvirt-gobject-input-stream.c | 78 +++---- libvirt-gobject/libvirt-gobject-output-stream.c | 76 +++--- libvirt-gobject/libvirt-gobject-storage-pool.c | 296 +++++++++--------------- libvirt-gobject/libvirt-gobject-stream.c | 54 +++-- 5 files changed, 320 insertions(+), 474 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 5509ce3..c768cd3 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -370,28 +370,20 @@ gboolean gvir_domain_start(GVirDomain *dom, return TRUE; } -typedef struct { - guint flags; -} DomainStartData; - -static void domain_start_data_free(DomainStartData *data) -{ - g_slice_free(DomainStartData, data); -} - static void -gvir_domain_start_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_start_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainStartData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer(res); - - if (!gvir_domain_start(dom, data->flags, &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_start(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -410,25 +402,18 @@ void gvir_domain_start_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - DomainStartData *data; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(DomainStartData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_start_async); - g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)domain_start_data_free); - g_simple_async_result_run_in_thread(res, - gvir_domain_start_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_start_helper); + g_object_unref(task); } gboolean gvir_domain_start_finish(GVirDomain *dom, @@ -436,13 +421,10 @@ gboolean gvir_domain_start_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_start_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -472,15 +454,18 @@ gboolean gvir_domain_resume(GVirDomain *dom, } static void -gvir_domain_resume_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_resume_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); GError *err = NULL; if (!gvir_domain_resume(dom, &err)) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -497,20 +482,17 @@ void gvir_domain_resume_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_resume_async); - g_simple_async_result_run_in_thread(res, - gvir_domain_resume_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_domain_resume_helper); + g_object_unref(task); } gboolean gvir_domain_resume_finish(GVirDomain *dom, @@ -518,13 +500,10 @@ gboolean gvir_domain_resume_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_resume_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -556,15 +535,19 @@ gboolean gvir_domain_wakeup(GVirDomain *dom, } static void -gvir_domain_wakeup_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_wakeup_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - if (!gvir_domain_wakeup(dom, (guint)g_simple_async_result_get_op_res_gssize(res), &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_wakeup(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -583,21 +566,18 @@ void gvir_domain_wakeup_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_wakeup_async); - g_simple_async_result_set_op_res_gssize (res, (gssize)flags); - g_simple_async_result_run_in_thread(res, - gvir_domain_wakeup_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_wakeup_helper); + g_object_unref(task); } gboolean gvir_domain_wakeup_finish(GVirDomain *dom, @@ -605,13 +585,10 @@ gboolean gvir_domain_wakeup_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_wakeup_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -785,18 +762,19 @@ static void domain_save_to_file_data_free(DomainSaveToFileData *data) } static void -gvir_domain_save_to_file_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_save_to_file_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainSaveToFileData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + DomainSaveToFileData *data = (DomainSaveToFileData *) task_data; GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer(res); - if (!gvir_domain_save_to_file(dom, data->filename, data->custom_conf, data->flags, &err)) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -819,7 +797,7 @@ void gvir_domain_save_to_file_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; DomainSaveToFileData *data; g_return_if_fail(GVIR_IS_DOMAIN(dom)); @@ -832,19 +810,15 @@ void gvir_domain_save_to_file_async(GVirDomain *dom, data->custom_conf = g_object_ref(custom_conf); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_save_to_file_async); - g_simple_async_result_set_op_res_gpointer(res, data, (GDestroyNotify) - domain_save_to_file_data_free); - - g_simple_async_result_run_in_thread(res, - gvir_domain_save_to_file_helper, - G_PRIORITY_DEFAULT, - cancellable); - - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, + data, + (GDestroyNotify) domain_save_to_file_data_free); + g_task_run_in_thread(task, gvir_domain_save_to_file_helper); + g_object_unref(task); } /** @@ -862,16 +836,10 @@ gboolean gvir_domain_save_to_file_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid - (result, - G_OBJECT(dom), - gvir_domain_save_to_file_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1012,22 +980,22 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, } static void -gvir_domain_get_info_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_get_info_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); GVirDomainInfo *info; GError *err = NULL; info = gvir_domain_get_info(dom, &err); if (err) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); else - g_simple_async_result_set_op_res_gpointer - (res, - info, - (GDestroyNotify) gvir_domain_info_free); + g_task_return_pointer(task, + info, + (GDestroyNotify) gvir_domain_info_free); } /** @@ -1044,20 +1012,17 @@ void gvir_domain_get_info_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_get_info_async); - g_simple_async_result_run_in_thread(res, - gvir_domain_get_info_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_domain_get_info_helper); + g_object_unref(task); } /** @@ -1075,22 +1040,11 @@ GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, GAsyncResult *result, GError **err) { - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); - GVirDomainInfo *ret; - g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); - g_return_val_if_fail - (g_simple_async_result_is_valid(result, - G_OBJECT(dom), - gvir_domain_get_info_async), - NULL); - - if (g_simple_async_result_propagate_error(res, err)) - return NULL; - - ret = g_simple_async_result_get_op_res_gpointer(res); + g_return_val_if_fail(g_task_is_valid(result, dom), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); - return gvir_domain_info_copy (ret); + return g_task_propagate_pointer(G_TASK(result), err); } /** @@ -1365,28 +1319,20 @@ gboolean gvir_domain_save (GVirDomain *dom, return TRUE; } -typedef struct { - guint flags; -} DomainSaveData; - -static void domain_save_data_free(DomainSaveData *data) -{ - g_slice_free (DomainSaveData, data); -} - static void -gvir_domain_save_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_save_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainSaveData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer (res); - - if (!gvir_domain_save(dom, data->flags, &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_save(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -1405,25 +1351,18 @@ void gvir_domain_save_async (GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - DomainSaveData *data; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(DomainSaveData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_save_async); - g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify) domain_save_data_free); - g_simple_async_result_run_in_thread(res, - gvir_domain_save_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_save_helper); + g_object_unref(task); } /** @@ -1441,15 +1380,10 @@ gboolean gvir_domain_save_finish (GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), - gvir_domain_save_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1682,6 +1616,7 @@ GVirDomainSnapshot *gvir_domain_create_snapshot_finish(GVirDomain *domain, GError **error) { g_return_val_if_fail(g_task_is_valid(result, domain), NULL); + g_return_val_if_fail(error == NULL || *error == NULL, NULL); return g_task_propagate_pointer(G_TASK(result), error); } @@ -1847,6 +1782,7 @@ gboolean gvir_domain_fetch_snapshots_finish(GVirDomain *dom, { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); g_return_val_if_fail(g_task_is_valid(res, dom), FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); return g_task_propagate_boolean(G_TASK(res), error); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index ff1a70c..8ef60d6 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -45,8 +45,7 @@ struct _GVirInputStreamPrivate GVirStream *stream; /* pending operation metadata */ - GSimpleAsyncResult *result; - GCancellable *cancellable; + GTask *task; gpointer buffer; gsize count; }; @@ -103,48 +102,45 @@ gvir_input_stream_read_ready(GVirStream *stream, { GVirInputStream *input_stream = GVIR_INPUT_STREAM(opaque); GVirInputStreamPrivate *priv = input_stream->priv; - GSimpleAsyncResult *simple = priv->result; + GTask *task = priv->task; + GCancellable *cancellable = g_task_get_cancellable(task); GError *error = NULL; gssize result; + priv->task = NULL; + if (!(cond & GVIR_STREAM_IO_CONDITION_READABLE)) { g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be readable"); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); goto cleanup; } - result = gvir_stream_receive(stream, priv->buffer, priv->count, - priv->cancellable, &error); + result = gvir_stream_receive(stream, priv->buffer, priv->count, + cancellable, &error); + if (error != NULL) { + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); + } else { + g_task_return_error(task, error); + } + g_error_free (error); - if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { - g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be readable"); goto cleanup; } - if (result >= 0) - g_simple_async_result_set_op_res_gssize(simple, result); - - if (error) - g_simple_async_result_take_error(simple, error); - - if (priv->cancellable) { - g_object_unref(priv->cancellable); - priv->cancellable = NULL; - } + g_task_return_int(task, result); cleanup: - priv->result = NULL; - g_simple_async_result_complete(simple); - g_object_unref(simple); + g_object_unref(task); return FALSE; } @@ -159,7 +155,7 @@ static void gvir_input_stream_read_async(GInputStream *stream, GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); g_return_if_fail(GVIR_IS_INPUT_STREAM(stream)); - g_return_if_fail(input_stream->priv->result == NULL); + g_return_if_fail(input_stream->priv->task == NULL); gvir_stream_add_watch_full(input_stream->priv->stream, G_PRIORITY_DEFAULT, @@ -168,12 +164,8 @@ static void gvir_input_stream_read_async(GInputStream *stream, g_object_ref(stream), (GDestroyNotify)g_object_unref); - input_stream->priv->result = - g_simple_async_result_new(G_OBJECT(stream), callback, user_data, - gvir_input_stream_read_async); - if (cancellable) - g_object_ref(cancellable); - input_stream->priv->cancellable = cancellable; + input_stream->priv->task = + g_task_new(stream, cancellable, callback, user_data); input_stream->priv->buffer = buffer; input_stream->priv->count = count; } @@ -181,22 +173,18 @@ static void gvir_input_stream_read_async(GInputStream *stream, static gssize gvir_input_stream_read_finish(GInputStream *stream, GAsyncResult *result, - GError **error G_GNUC_UNUSED) + GError **error) { GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); - GSimpleAsyncResult *simple; virStreamPtr handle; gssize count; g_return_val_if_fail(GVIR_IS_INPUT_STREAM(stream), -1); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(stream), - gvir_input_stream_read_async), - -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); g_object_get(input_stream->priv->stream, "handle", &handle, NULL); - simple = G_SIMPLE_ASYNC_RESULT(result); - - count = g_simple_async_result_get_op_res_gssize(simple); + count = g_task_propagate_int(G_TASK(result), error); virStreamFree(handle); diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index f39328b..6968c3d 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -45,8 +45,7 @@ struct _GVirOutputStreamPrivate GVirStream *stream; /* pending operation metadata */ - GSimpleAsyncResult *result; - GCancellable *cancellable; + GTask *task; const void * buffer; gsize count; }; @@ -103,48 +102,45 @@ gvir_output_stream_write_ready(GVirStream *stream, { GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(opaque); GVirOutputStreamPrivate *priv = output_stream->priv; - GSimpleAsyncResult *simple = priv->result; + GTask *task = priv->task; + GCancellable *cancellable = g_task_get_cancellable(task); GError *error = NULL; gssize result; if (!(cond & GVIR_STREAM_IO_CONDITION_WRITABLE)) { g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be writable"); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); goto cleanup; } result = gvir_stream_send(stream, priv->buffer, priv->count, - priv->cancellable, &error); + cancellable, &error); + + if (error != NULL) { + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be writable"); + } else { + g_task_return_error(task, error); + } + g_error_free (error); - if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { - g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be writable"); goto cleanup; } - if (result >= 0) - g_simple_async_result_set_op_res_gssize(simple, result); - - if (error) - g_simple_async_result_take_error(simple, error); - - if (priv->cancellable) { - g_object_unref(priv->cancellable); - priv->cancellable = NULL; - } + g_task_return_int(task, result); cleanup: - priv->result = NULL; - g_simple_async_result_complete(simple); - g_object_unref(simple); + priv->task = NULL; + g_object_unref(task); return FALSE; } @@ -159,7 +155,7 @@ static void gvir_output_stream_write_async(GOutputStream *stream, GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(stream); g_return_if_fail(GVIR_IS_OUTPUT_STREAM(stream)); - g_return_if_fail(output_stream->priv->result == NULL); + g_return_if_fail(output_stream->priv->task == NULL); gvir_stream_add_watch_full(output_stream->priv->stream, G_PRIORITY_DEFAULT, @@ -168,12 +164,8 @@ static void gvir_output_stream_write_async(GOutputStream *stream, g_object_ref(stream), (GDestroyNotify)g_object_unref); - output_stream->priv->result = - g_simple_async_result_new(G_OBJECT(stream), callback, user_data, - gvir_output_stream_write_async); - if (cancellable) - g_object_ref(cancellable); - output_stream->priv->cancellable = cancellable; + output_stream->priv->task = + g_task_new(stream, cancellable, callback, user_data); output_stream->priv->buffer = buffer; output_stream->priv->count = count; } @@ -181,22 +173,18 @@ static void gvir_output_stream_write_async(GOutputStream *stream, static gssize gvir_output_stream_write_finish(GOutputStream *stream, GAsyncResult *result, - GError **error G_GNUC_UNUSED) + GError **error) { GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(stream); - GSimpleAsyncResult *simple; virStreamPtr handle; gssize count; g_return_val_if_fail(GVIR_IS_OUTPUT_STREAM(stream), -1); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(stream), - gvir_output_stream_write_async), - -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); g_object_get(output_stream->priv->stream, "handle", &handle, NULL); - simple = G_SIMPLE_ASYNC_RESULT(result); - - count = g_simple_async_result_get_op_res_gssize(simple); + count = g_task_propagate_int(G_TASK(result), error); virStreamFree(handle); diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index a0dcebc..5f97691 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -439,17 +439,18 @@ cleanup: } static void -gvir_storage_pool_refresh_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_refresh_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_refresh(pool, cancellable, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_refresh(pool, cancellable, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -464,20 +465,17 @@ void gvir_storage_pool_refresh_async(GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_refresh_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_refresh_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_refresh_helper); + g_object_unref(task); } /** @@ -490,15 +488,10 @@ gboolean gvir_storage_pool_refresh_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_refresh_async), - FALSE); - - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } static void gvir_storage_vol_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) @@ -654,28 +647,20 @@ gboolean gvir_storage_pool_build (GVirStoragePool *pool, return TRUE; } -typedef struct { - guint flags; -} StoragePoolBuildData; - static void -gvir_storage_pool_build_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_build_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); - StoragePoolBuildData *data; + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); - - if (!gvir_storage_pool_build(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_build(pool, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -692,25 +677,18 @@ void gvir_storage_pool_build_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - StoragePoolBuildData *data; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(StoragePoolBuildData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_build_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_build_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_storage_pool_build_helper); + g_object_unref(task); } /** @@ -726,16 +704,10 @@ gboolean gvir_storage_pool_build_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_build_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -762,17 +734,18 @@ gboolean gvir_storage_pool_undefine (GVirStoragePool *pool, } static void -gvir_storage_pool_undefine_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_undefine_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_undefine(pool, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_undefine(pool, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -787,20 +760,17 @@ void gvir_storage_pool_undefine_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_undefine_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_undefine_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_undefine_helper); + g_object_unref(task); } /** @@ -816,16 +786,10 @@ gboolean gvir_storage_pool_undefine_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_undefine_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -854,23 +818,19 @@ gboolean gvir_storage_pool_start (GVirStoragePool *pool, } static void -gvir_storage_pool_start_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_start_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); - StoragePoolBuildData *data; + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); - - if (!gvir_storage_pool_start(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_start(pool, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -887,25 +847,18 @@ void gvir_storage_pool_start_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - StoragePoolBuildData *data; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(StoragePoolBuildData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_start_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_start_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_storage_pool_start_helper); + g_object_unref(task); } /** @@ -921,16 +874,10 @@ gboolean gvir_storage_pool_start_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_start_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -957,17 +904,18 @@ gboolean gvir_storage_pool_stop (GVirStoragePool *pool, } static void -gvir_storage_pool_stop_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_stop_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_stop(pool, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_stop(pool, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -982,20 +930,17 @@ void gvir_storage_pool_stop_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_stop_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_stop_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_stop_helper); + g_object_unref(task); } /** @@ -1011,16 +956,10 @@ gboolean gvir_storage_pool_stop_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_stop_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1100,23 +1039,19 @@ gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, } static void -gvir_storage_pool_delete_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_delete_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); - StoragePoolBuildData *data; + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); - - if (!gvir_storage_pool_delete(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_delete(pool, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -1133,25 +1068,18 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - StoragePoolBuildData *data; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(StoragePoolBuildData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_delete_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_delete_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_storage_pool_delete_helper); + g_object_unref(task); } /** @@ -1167,16 +1095,10 @@ gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_delete_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } G_GNUC_INTERNAL void gvir_storage_pool_delete_vol(GVirStoragePool *pool, diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 46dbd9a..2bb3e20 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -129,14 +129,11 @@ static gboolean gvir_stream_close(GIOStream *io_stream, return (i_ret && o_ret); } - -static void gvir_stream_close_async(GIOStream *stream, - int io_priority G_GNUC_UNUSED, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +static gboolean close_in_idle (gpointer data) { - GSimpleAsyncResult *res; + GTask *task = G_TASK (data); + GIOStream *stream = G_IO_STREAM(g_task_get_source_object (task)); + GCancellable *cancellable = g_task_get_cancellable (task); GIOStreamClass *class; GError *error; @@ -146,27 +143,42 @@ static void gvir_stream_close_async(GIOStream *stream, error = NULL; if (class->close_fn && !class->close_fn(stream, cancellable, &error)) { - g_simple_async_report_take_gerror_in_idle(G_OBJECT (stream), - callback, user_data, - error); - return; + g_task_return_error(task, error); + + goto exit; } - res = g_simple_async_result_new(G_OBJECT (stream), - callback, - user_data, - gvir_stream_close_async); - g_simple_async_result_complete_in_idle(res); - g_object_unref (res); + g_task_return_boolean(task, TRUE); +exit: + g_object_unref(task); + return FALSE; } +static void gvir_stream_close_async(GIOStream *stream, + int io_priority G_GNUC_UNUSED, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + + task = g_task_new(G_OBJECT(stream), + cancellable, + callback, + user_data); + g_idle_add(close_in_idle, task); +} static gboolean -gvir_stream_close_finish(GIOStream *stream G_GNUC_UNUSED, - GAsyncResult *result G_GNUC_UNUSED, - GError **error G_GNUC_UNUSED) +gvir_stream_close_finish(GIOStream *stream, + GAsyncResult *result, + GError **error) { - return TRUE; + g_return_val_if_fail(GVIR_IS_STREAM(stream), -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); + + return g_task_propagate_boolean(G_TASK(result), error); } -- 2.5.0

2 2

[libvirt] [PATCH] Wait for udev events to be handled after removing veth
by Cédric Bosdonnat 26 Nov '15

26 Nov '15

As per http://www.redhat.com/archives/libvir-list/2013-July/msg01279.html, wait for udev events to be handled after removing a virtual NIC. Any udev rule associated to NIC destroy could happen to run with a new device with the same name that is being created. --- src/util/virnetdevveth.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 6905168..c8a38fb 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -225,5 +225,8 @@ int virNetDevVethDelete(const char *veth) ret = 0; cleanup: virCommandFree(cmd); + /* Make sure the device is properly down: creating a new one + * with the same name could lead to troubles */ + virFileWaitForDevices(); return ret; } -- 2.1.4

3 2

[libvirt] [PATCH] virsh: Try to keep printed XML pretty with change-media
by Martin Kletzander 26 Nov '15

26 Nov '15

When adding a new media with change-media and --print-xml, let's try making it more readable and nice. Before: <disk type="file" device="cdrom"> ... <target dev="hdb" bus="ide"/> <address type="drive" controller="0" bus="0" target="0" unit="1"/> <source file="/tmp/a.iso"/></disk> After: <disk type="file" device="cdrom"> ... <source file="/tmp/a.iso"/> <target dev="hdb" bus="ide"/> <address type="drive" controller="0" bus="0" target="0" unit="1"/> </disk> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1219719 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh-domain.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index bd00785622b2..16b01d3dc631 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11566,7 +11566,10 @@ virshUpdateDiskXML(xmlNodePtr disk_node, const char *target, virshUpdateDiskXMLType type) { + xmlNodePtr tmp = NULL; xmlNodePtr source = NULL; + xmlNodePtr target_node = NULL; + xmlNodePtr text_node = NULL; char *device_type = NULL; char *ret = NULL; char *startupPolicy = NULL; @@ -11583,9 +11586,31 @@ virshUpdateDiskXML(xmlNodePtr disk_node, } /* find the current source subelement */ - for (source = disk_node->children; source; source = source->next) { - if (source->type == XML_ELEMENT_NODE && - xmlStrEqual(source->name, BAD_CAST "source")) + for (tmp = disk_node->children; tmp; tmp = tmp->next) { + /* + * Safe the last text node before the <target/>. The + * reasoning behind this is that the target node will be + * present in this case and also has a proper indentation. + */ + if (!target_node && tmp->type == XML_TEXT_NODE) + text_node = tmp; + + /* + * We need only element nodes from now on. + */ + if (tmp->type != XML_ELEMENT_NODE) + continue; + + if (xmlStrEqual(tmp->name, BAD_CAST "source")) + source = tmp; + + if (xmlStrEqual(tmp->name, BAD_CAST "target")) + target_node = tmp; + + /* + * We've found all we needed. + */ + if (source && target_node) break; } @@ -11637,7 +11662,22 @@ virshUpdateDiskXML(xmlNodePtr disk_node, if (startupPolicy) xmlNewProp(source, BAD_CAST "startupPolicy", BAD_CAST startupPolicy); - xmlAddChild(disk_node, source); + + /* + * So that the output XML looks nice in case anyone calls + * 'change-media' with '--print-xml', let's attach the source + * before target... + */ + xmlAddPrevSibling(target_node, source); + + /* + * ... and duplicate the text node doing the indentation just + * so it's more easily readable. And don't make it fatal. + */ + if ((tmp = xmlCopyNode(text_node, 0))) { + if (!xmlAddPrevSibling(target_node, tmp)) + xmlFreeNode(tmp); + } } if (!(ret = virXMLNodeToString(NULL, disk_node))) { -- 2.6.3

2 2

[libvirt] [PATCH] systemd: Escape machine name for machined
by Martin Kletzander 26 Nov '15

26 Nov '15

According to the documentation, CreateMachine accepts only 7bit ASCII characters in the machinename parameter, so let's make sure we can start machines with unicode names with systemd. We already have a function for that, we just forgot to use it. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1062943 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1282846 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virsystemd.c | 12 ++++++++---- tests/virsystemdtest.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 1354b08b9e04..abd883c73844 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -119,16 +119,20 @@ char *virSystemdMakeMachineName(const char *name, { char *machinename = NULL; char *username = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + if (privileged) { - if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) - goto cleanup; + virBufferAsprintf(&buf, "%s-", drivername); } else { if (!(username = virGetUserName(geteuid()))) goto cleanup; - if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) - goto cleanup; + + virBufferAsprintf(&buf, "%s-%s-", username, drivername); } + virSystemdEscapeName(&buf, name); + + machinename = virBufferContentAndReset(&buf); cleanup: VIR_FREE(username); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index d0b9335b24ae..06fec5495bc2 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -338,7 +338,7 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) } -struct testScopeData { +struct testNameData { const char *name; const char *expected; }; @@ -346,7 +346,7 @@ struct testScopeData { static int testScopeName(const void *opaque) { - const struct testScopeData *data = opaque; + const struct testNameData *data = opaque; int ret = -1; char *actual = NULL; @@ -366,6 +366,29 @@ testScopeName(const void *opaque) return ret; } +static int +testMachineName(const void *opaque) +{ + const struct testNameData *data = opaque; + int ret = -1; + char *actual = NULL; + + if (!(actual = virSystemdMakeMachineName(data->name, "qemu", true))) + goto cleanup; + + if (STRNEQ(actual, data->expected)) { + fprintf(stderr, "Expected '%s' but got '%s'\n", + data->expected, actual); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(actual); + return ret; +} + typedef int (*virSystemdCanHelper)(bool * result); struct testPMSupportData { virSystemdCanHelper tested; @@ -471,7 +494,7 @@ mymain(void) # define TEST_SCOPE(name, unitname) \ do { \ - struct testScopeData data = { \ + struct testNameData data = { \ name, unitname \ }; \ if (virtTestRun("Test scopename", testScopeName, &data) < 0) \ @@ -482,6 +505,22 @@ mymain(void) TEST_SCOPE("demo-name", "machine-lxc\\x2ddemo\\x2dname.scope"); TEST_SCOPE("demo!name", "machine-lxc\\x2ddemo\\x21name.scope"); TEST_SCOPE(".demo", "machine-lxc\\x2d\\x2edemo.scope"); + TEST_SCOPE("bull💩", "machine-lxc\\x2dbull\\xf0\\x9f\\x92\\xa9.scope"); + +# define TEST_MACHINE(name, machinename) \ + do { \ + struct testNameData data = { \ + name, machinename \ + }; \ + if (virtTestRun("Test scopename", testMachineName, &data) < 0) \ + ret = -1; \ + } while (0) + + TEST_MACHINE("demo", "qemu-demo"); + TEST_MACHINE("demo-name", "qemu-demo\\x2dname"); + TEST_MACHINE("demo!name", "qemu-demo\\x21name"); + TEST_MACHINE(".demo", "qemu-\\x2edemo"); + TEST_MACHINE("bull\U0001f4a9", "qemu-bull\\xf0\\x9f\\x92\\xa9"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ do { \ -- 2.6.3

2 1

[libvirt] [PATCH] schema: use a better regex for listen addresses
by Ján Tomko 26 Nov '15

26 Nov '15

A domain with '::' as the listen address fails to validate. Reuse the 'ipAddr' and 'dnsName' regexes from basictypes instead of reinventing them. https://bugzilla.redhat.com/show_bug.cgi?id=1285665 --- docs/schemas/domaincommon.rng | 7 ++++--- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 7e7fd58..95366bb 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5221,9 +5221,10 @@ </data> </define> <define name="addrIPorName"> - <data type="string"> - <param name="pattern">(([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9])|(([0-9a-fA-F]+|:)+[0-9a-fA-F]+)|([a-zA-Z0-9_\.\+\-]*)</param> - </data> + <choice> + <ref name="ipAddr"/> + <ref name="dnsName"/> + </choice> </define> <define name="usbIdDefault"> <data type="string"> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index 473b0e5..36e42e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -19,5 +19,5 @@ QEMU_AUDIO_DRV=none \ -net none \ -serial none \ -parallel none \ --vnc 127.0.0.1:59630,share=allow-exclusive \ +-vnc '[::]:59630,share=allow-exclusive' \ -vga cirrus diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml index 4b88e49..1c76ddc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml @@ -25,8 +25,8 @@ <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='65530' autoport='no' listen='127.0.0.1' sharePolicy='allow-exclusive'> - <listen type='address' address='127.0.0.1'/> + <graphics type='vnc' port='65530' autoport='no' listen='::' sharePolicy='allow-exclusive'> + <listen type='address' address='::'/> </graphics> <video> <model type='cirrus' vram='16384' heads='1'/> -- 2.4.6

3 2

[libvirt] [PATCH] Enhance documentation of virDomainDetachDevice
by Jiri Denemark 26 Nov '15

26 Nov '15

Link it to virDomainDetachDeviceFlags. https://bugzilla.redhat.com/show_bug.cgi?id=1257280 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/libvirt-domain.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7cfbe58..7cfc4d2 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8392,19 +8392,10 @@ virDomainAttachDeviceFlags(virDomainPtr domain, * @domain: pointer to domain object * @xml: pointer to XML description of one device * - * Destroy a virtual device attachment to backend. This function, - * having hot-unplug semantics, is only allowed on an active domain. + * This is an equivalent of virDomainDetachDeviceFlags() when called with + * @flags parameter set to VIR_DOMAIN_AFFECT_LIVE. * - * Be aware that hotplug changes might not persist across a domain going - * into S4 state (also known as hibernation) unless you also modify the - * persistent domain definition. - * - * The supplied XML description of the device should be as specific - * as its definition in the domain XML. The set of attributes used - * to match the device are internal to the drivers. Using a partial definition, - * or attempting to detach a device that is not present in the domain XML, - * but shares some specific attributes with one that is present, - * may lead to unexpected results. + * See virDomainDetachDeviceFlags() for more details. * * Returns 0 in case of success, -1 in case of failure. */ -- 2.6.3

2 1

[libvirt] [PATCH] lxc: drop sys_admin caps by default
by Cédric Bosdonnat 26 Nov '15

26 Nov '15

To make sure the container user doesn't play with mounts, like changing them from ro to rw, drop the sys_admin capability by default. If user really needs to play with those, it can be enabled in the configuration. --- Note: it seems that patch 3/3 or my last series never reached the list. Here it is. src/lxc/lxc_container.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c5a70a1..d6d6fba 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2083,6 +2083,7 @@ static int lxcContainerDropCapabilities(virDomainDefPtr def, case VIR_DOMAIN_CAPS_FEATURE_MKNOD: /* No creating device nodes */ case VIR_DOMAIN_CAPS_FEATURE_AUDIT_CONTROL: /* No messing with auditing status */ case VIR_DOMAIN_CAPS_FEATURE_MAC_ADMIN: /* No messing with LSM config */ + case VIR_DOMAIN_CAPS_FEATURE_SYS_ADMIN: /* No messing with mounts */ toDrop = (state != VIR_TRISTATE_SWITCH_ON); break; default: /* User specified capabilities to drop */ -- 2.1.4

3 2

[libvirt] [PATCH] virtlockd: fix misc memory leaks and other bugs
by Daniel P. Berrange 26 Nov '15

26 Nov '15

Fix memory leaks, failure to restore umask and missing man page docs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/locking/lock_daemon.c | 6 +++++- src/locking/virtlockd.pod.in | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 3dc47c1..a5a40fe 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -118,6 +118,7 @@ virLockDaemonFree(virLockDaemonPtr lockd) if (!lockd) return; + virMutexDestroy(&lockd->lock); virObjectUnref(lockd->dmn); virHashFree(lockd->lockspaces); virLockSpaceFree(lockd->defaultLockspace); @@ -410,6 +411,7 @@ virLockDaemonUnixSocketPaths(bool privileged, old_umask = umask(077); if (virFileMakePath(rundir) < 0) { + VIR_FREE(rundir); umask(old_umask); goto error; } @@ -516,6 +518,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, old_umask = umask(077); if (virFileMakePath(logdir) < 0) { + VIR_FREE(logdir); umask(old_umask); goto error; } @@ -1187,7 +1190,7 @@ int main(int argc, char **argv) { int c; char *tmp; - c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx); + c = getopt_long(argc, argv, "df:p:t:vVh", opts, &optidx); if (c == -1) break; @@ -1321,6 +1324,7 @@ int main(int argc, char **argv) { VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, virStrerror(errno, ebuf, sizeof(ebuf))); ret = VIR_LOCK_DAEMON_ERR_RUNDIR; + umask(old_umask); goto cleanup; } umask(old_umask); diff --git a/src/locking/virtlockd.pod.in b/src/locking/virtlockd.pod.in index 99612aa..661473c 100644 --- a/src/locking/virtlockd.pod.in +++ b/src/locking/virtlockd.pod.in @@ -4,7 +4,7 @@ virtlockd - libvirt lock management daemon =head1 SYNOPSIS -B<virtlockd> [ -dv ] [ -f config_file ] [ -p pid_file ] +B<virtlockd> [ -dvV ] [ -t timeout] [ -f config_file ] [ -p pid_file ] B<virtlockd> --version @@ -38,6 +38,11 @@ Run as a daemon and write PID file. Use this configuration file, overriding the default value. +=item B<-t, --timeout> I<SECONDS> + +Automatically shutdown after I<SECONDS> have elapsed with +no active client or lock. + =item B<-p, --pid-file> I<FILE> Use this name for the PID file, overriding the default value. -- 2.5.0

2 1

[libvirt] [PATCH] logging: inhibit virtlogd shutdown while log files are open
by Daniel P. Berrange 26 Nov '15

26 Nov '15

The virtlogd daemon is launched with a 30 second timeout for unprivileged users. Unfortunately the timeout is only inhibited while RPC clients are connected, and they only connect for a short while to open the log file descriptor. We need to hold an inhibition for as long as the log file descriptor itself is open. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/logging/log_daemon.c | 19 +++++++++++++++++-- src/logging/log_handler.c | 33 +++++++++++++++++++++++++++------ src/logging/log_handler.h | 11 +++++++++-- 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 7a1afec..3fda9ca 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -124,6 +124,17 @@ virLogDaemonFree(virLogDaemonPtr logd) } +static void +virLogDaemonInhibitor(bool inhibit, void *opaque) +{ + virLogDaemonPtr daemon = opaque; + + if (inhibit) + virNetDaemonAddShutdownInhibition(daemon->dmn); + else + virNetDaemonRemoveShutdownInhibition(daemon->dmn); +} + static virLogDaemonPtr virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) { @@ -152,7 +163,9 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) virNetDaemonAddServer(logd->dmn, logd->srv) < 0) goto error; - if (!(logd->handler = virLogHandlerNew(privileged))) + if (!(logd->handler = virLogHandlerNew(privileged, + virLogDaemonInhibitor, + logd))) goto error; return logd; @@ -210,7 +223,9 @@ virLogDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) } if (!(logd->handler = virLogHandlerNewPostExecRestart(child, - privileged))) + privileged, + virLogDaemonInhibitor, + logd))) goto error; return logd; diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 2acbca7..a4f0395 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -59,6 +59,9 @@ struct _virLogHandler { bool privileged; virLogHandlerLogFilePtr *files; size_t nfiles; + + virLogHandlerShutdownInhibitor inhibitor; + void *opaque; }; static virClassPtr virLogHandlerClass; @@ -165,13 +168,16 @@ virLogHandlerDomainLogFileEvent(int watch, return; error: + handler->inhibitor(false, handler->opaque); virLogHandlerLogFileClose(handler, logfile); virObjectUnlock(handler); } virLogHandlerPtr -virLogHandlerNew(bool privileged) +virLogHandlerNew(bool privileged, + virLogHandlerShutdownInhibitor inhibitor, + void *opaque) { virLogHandlerPtr handler; @@ -182,6 +188,8 @@ virLogHandlerNew(bool privileged) goto error; handler->privileged = privileged; + handler->inhibitor = inhibitor; + handler->opaque = opaque; return handler; @@ -191,7 +199,8 @@ virLogHandlerNew(bool privileged) static virLogHandlerLogFilePtr -virLogHandlerLogFilePostExecRestart(virJSONValuePtr object) +virLogHandlerLogFilePostExecRestart(virLogHandlerPtr handler, + virJSONValuePtr object) { virLogHandlerLogFilePtr file; const char *path; @@ -199,6 +208,8 @@ virLogHandlerLogFilePostExecRestart(virJSONValuePtr object) if (VIR_ALLOC(file) < 0) return NULL; + handler->inhibitor(true, handler->opaque); + if ((path = virJSONValueObjectGetString(object, "path")) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing file path in JSON document")); @@ -226,6 +237,7 @@ virLogHandlerLogFilePostExecRestart(virJSONValuePtr object) return file; error: + handler->inhibitor(false, handler->opaque); virLogHandlerLogFileFree(file); return NULL; } @@ -233,14 +245,18 @@ virLogHandlerLogFilePostExecRestart(virJSONValuePtr object) virLogHandlerPtr virLogHandlerNewPostExecRestart(virJSONValuePtr object, - bool privileged) + bool privileged, + virLogHandlerShutdownInhibitor inhibitor, + void *opaque) { virLogHandlerPtr handler; virJSONValuePtr files; ssize_t n; size_t i; - if (!(handler = virLogHandlerNew(privileged))) + if (!(handler = virLogHandlerNew(privileged, + inhibitor, + opaque))) return NULL; if (!(files = virJSONValueObjectGet(object, "files"))) { @@ -259,7 +275,7 @@ virLogHandlerNewPostExecRestart(virJSONValuePtr object, virLogHandlerLogFilePtr file; virJSONValuePtr child = virJSONValueArrayGet(files, i); - if (!(file = virLogHandlerLogFilePostExecRestart(child))) + if (!(file = virLogHandlerLogFilePostExecRestart(handler, child))) goto error; if (VIR_APPEND_ELEMENT_COPY(handler->files, handler->nfiles, file) < 0) @@ -290,8 +306,10 @@ virLogHandlerDispose(void *obj) virLogHandlerPtr handler = obj; size_t i; - for (i = 0; i < handler->nfiles; i++) + for (i = 0; i < handler->nfiles; i++) { + handler->inhibitor(false, handler->opaque); virLogHandlerLogFileFree(handler->files[i]); + } VIR_FREE(handler->files); } @@ -341,6 +359,8 @@ virLogHandlerDomainOpenLogFile(virLogHandlerPtr handler, virObjectLock(handler); + handler->inhibitor(true, handler->opaque); + if (!(path = virLogHandlerGetLogFilePathForDomain(handler, driver, domuuid, @@ -400,6 +420,7 @@ virLogHandlerDomainOpenLogFile(virLogHandlerPtr handler, VIR_FREE(path); VIR_FORCE_CLOSE(pipefd[0]); VIR_FORCE_CLOSE(pipefd[1]); + handler->inhibitor(false, handler->opaque); virLogHandlerLogFileFree(file); virObjectUnlock(handler); return -1; diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 1ad755e..e41ac7f 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -30,9 +30,16 @@ typedef struct _virLogHandler virLogHandler; typedef virLogHandler *virLogHandlerPtr; -virLogHandlerPtr virLogHandlerNew(bool privileged); +typedef void (*virLogHandlerShutdownInhibitor)(bool inhibit, + void *opaque); + +virLogHandlerPtr virLogHandlerNew(bool privileged, + virLogHandlerShutdownInhibitor inhibitor, + void *opaque); virLogHandlerPtr virLogHandlerNewPostExecRestart(virJSONValuePtr child, - bool privileged); + bool privileged, + virLogHandlerShutdownInhibitor inhibitor, + void *opaque); void virLogHandlerFree(virLogHandlerPtr handler); -- 2.5.0

2 1

[libvirt] [libvirt-glib v4] gobject: Port to GTask API
by Zeeshan Ali (Khattak) 25 Nov '15

25 Nov '15

Drop usage of deprecated GSimpleAsyncResult API. --- libvirt-gobject/libvirt-gobject-domain.c | 290 +++++++++--------------- libvirt-gobject/libvirt-gobject-input-stream.c | 77 +++---- libvirt-gobject/libvirt-gobject-output-stream.c | 75 +++--- libvirt-gobject/libvirt-gobject-storage-pool.c | 281 ++++++++++------------- libvirt-gobject/libvirt-gobject-stream.c | 53 +++-- 5 files changed, 322 insertions(+), 454 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 5509ce3..c768cd3 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -370,28 +370,20 @@ gboolean gvir_domain_start(GVirDomain *dom, return TRUE; } -typedef struct { - guint flags; -} DomainStartData; - -static void domain_start_data_free(DomainStartData *data) -{ - g_slice_free(DomainStartData, data); -} - static void -gvir_domain_start_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_start_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainStartData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer(res); - - if (!gvir_domain_start(dom, data->flags, &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_start(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -410,25 +402,18 @@ void gvir_domain_start_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - DomainStartData *data; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(DomainStartData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_start_async); - g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)domain_start_data_free); - g_simple_async_result_run_in_thread(res, - gvir_domain_start_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_start_helper); + g_object_unref(task); } gboolean gvir_domain_start_finish(GVirDomain *dom, @@ -436,13 +421,10 @@ gboolean gvir_domain_start_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_start_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -472,15 +454,18 @@ gboolean gvir_domain_resume(GVirDomain *dom, } static void -gvir_domain_resume_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_resume_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); GError *err = NULL; if (!gvir_domain_resume(dom, &err)) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -497,20 +482,17 @@ void gvir_domain_resume_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_resume_async); - g_simple_async_result_run_in_thread(res, - gvir_domain_resume_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_domain_resume_helper); + g_object_unref(task); } gboolean gvir_domain_resume_finish(GVirDomain *dom, @@ -518,13 +500,10 @@ gboolean gvir_domain_resume_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_resume_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -556,15 +535,19 @@ gboolean gvir_domain_wakeup(GVirDomain *dom, } static void -gvir_domain_wakeup_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_wakeup_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - if (!gvir_domain_wakeup(dom, (guint)g_simple_async_result_get_op_res_gssize(res), &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_wakeup(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -583,21 +566,18 @@ void gvir_domain_wakeup_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_wakeup_async); - g_simple_async_result_set_op_res_gssize (res, (gssize)flags); - g_simple_async_result_run_in_thread(res, - gvir_domain_wakeup_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_wakeup_helper); + g_object_unref(task); } gboolean gvir_domain_wakeup_finish(GVirDomain *dom, @@ -605,13 +585,10 @@ gboolean gvir_domain_wakeup_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_wakeup_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -785,18 +762,19 @@ static void domain_save_to_file_data_free(DomainSaveToFileData *data) } static void -gvir_domain_save_to_file_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_save_to_file_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainSaveToFileData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + DomainSaveToFileData *data = (DomainSaveToFileData *) task_data; GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer(res); - if (!gvir_domain_save_to_file(dom, data->filename, data->custom_conf, data->flags, &err)) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -819,7 +797,7 @@ void gvir_domain_save_to_file_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; DomainSaveToFileData *data; g_return_if_fail(GVIR_IS_DOMAIN(dom)); @@ -832,19 +810,15 @@ void gvir_domain_save_to_file_async(GVirDomain *dom, data->custom_conf = g_object_ref(custom_conf); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_save_to_file_async); - g_simple_async_result_set_op_res_gpointer(res, data, (GDestroyNotify) - domain_save_to_file_data_free); - - g_simple_async_result_run_in_thread(res, - gvir_domain_save_to_file_helper, - G_PRIORITY_DEFAULT, - cancellable); - - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, + data, + (GDestroyNotify) domain_save_to_file_data_free); + g_task_run_in_thread(task, gvir_domain_save_to_file_helper); + g_object_unref(task); } /** @@ -862,16 +836,10 @@ gboolean gvir_domain_save_to_file_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid - (result, - G_OBJECT(dom), - gvir_domain_save_to_file_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1012,22 +980,22 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, } static void -gvir_domain_get_info_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_get_info_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); GVirDomainInfo *info; GError *err = NULL; info = gvir_domain_get_info(dom, &err); if (err) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); else - g_simple_async_result_set_op_res_gpointer - (res, - info, - (GDestroyNotify) gvir_domain_info_free); + g_task_return_pointer(task, + info, + (GDestroyNotify) gvir_domain_info_free); } /** @@ -1044,20 +1012,17 @@ void gvir_domain_get_info_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_get_info_async); - g_simple_async_result_run_in_thread(res, - gvir_domain_get_info_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_domain_get_info_helper); + g_object_unref(task); } /** @@ -1075,22 +1040,11 @@ GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, GAsyncResult *result, GError **err) { - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); - GVirDomainInfo *ret; - g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); - g_return_val_if_fail - (g_simple_async_result_is_valid(result, - G_OBJECT(dom), - gvir_domain_get_info_async), - NULL); - - if (g_simple_async_result_propagate_error(res, err)) - return NULL; - - ret = g_simple_async_result_get_op_res_gpointer(res); + g_return_val_if_fail(g_task_is_valid(result, dom), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); - return gvir_domain_info_copy (ret); + return g_task_propagate_pointer(G_TASK(result), err); } /** @@ -1365,28 +1319,20 @@ gboolean gvir_domain_save (GVirDomain *dom, return TRUE; } -typedef struct { - guint flags; -} DomainSaveData; - -static void domain_save_data_free(DomainSaveData *data) -{ - g_slice_free (DomainSaveData, data); -} - static void -gvir_domain_save_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_save_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainSaveData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer (res); - - if (!gvir_domain_save(dom, data->flags, &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_save(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -1405,25 +1351,18 @@ void gvir_domain_save_async (GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - DomainSaveData *data; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(DomainSaveData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_save_async); - g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify) domain_save_data_free); - g_simple_async_result_run_in_thread(res, - gvir_domain_save_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_save_helper); + g_object_unref(task); } /** @@ -1441,15 +1380,10 @@ gboolean gvir_domain_save_finish (GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), - gvir_domain_save_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1682,6 +1616,7 @@ GVirDomainSnapshot *gvir_domain_create_snapshot_finish(GVirDomain *domain, GError **error) { g_return_val_if_fail(g_task_is_valid(result, domain), NULL); + g_return_val_if_fail(error == NULL || *error == NULL, NULL); return g_task_propagate_pointer(G_TASK(result), error); } @@ -1847,6 +1782,7 @@ gboolean gvir_domain_fetch_snapshots_finish(GVirDomain *dom, { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); g_return_val_if_fail(g_task_is_valid(res, dom), FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); return g_task_propagate_boolean(G_TASK(res), error); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index ff1a70c..cd107e1 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -45,8 +45,7 @@ struct _GVirInputStreamPrivate GVirStream *stream; /* pending operation metadata */ - GSimpleAsyncResult *result; - GCancellable *cancellable; + GTask *task; gpointer buffer; gsize count; }; @@ -103,48 +102,44 @@ gvir_input_stream_read_ready(GVirStream *stream, { GVirInputStream *input_stream = GVIR_INPUT_STREAM(opaque); GVirInputStreamPrivate *priv = input_stream->priv; - GSimpleAsyncResult *simple = priv->result; + GTask *task = priv->task; + GCancellable *cancellable = g_task_get_cancellable(task); GError *error = NULL; gssize result; + priv->task = NULL; + if (!(cond & GVIR_STREAM_IO_CONDITION_READABLE)) { g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be readable"); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); goto cleanup; } - result = gvir_stream_receive(stream, priv->buffer, priv->count, - priv->cancellable, &error); + result = gvir_stream_receive(stream, priv->buffer, priv->count, + cancellable, &error); + if (error != NULL) { + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); + } else { + g_task_return_error(task, error); + } - if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { - g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be readable"); goto cleanup; } - if (result >= 0) - g_simple_async_result_set_op_res_gssize(simple, result); - - if (error) - g_simple_async_result_take_error(simple, error); - - if (priv->cancellable) { - g_object_unref(priv->cancellable); - priv->cancellable = NULL; - } + g_task_return_int(task, result); cleanup: - priv->result = NULL; - g_simple_async_result_complete(simple); - g_object_unref(simple); + g_object_unref(task); return FALSE; } @@ -159,7 +154,7 @@ static void gvir_input_stream_read_async(GInputStream *stream, GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); g_return_if_fail(GVIR_IS_INPUT_STREAM(stream)); - g_return_if_fail(input_stream->priv->result == NULL); + g_return_if_fail(input_stream->priv->task == NULL); gvir_stream_add_watch_full(input_stream->priv->stream, G_PRIORITY_DEFAULT, @@ -168,12 +163,8 @@ static void gvir_input_stream_read_async(GInputStream *stream, g_object_ref(stream), (GDestroyNotify)g_object_unref); - input_stream->priv->result = - g_simple_async_result_new(G_OBJECT(stream), callback, user_data, - gvir_input_stream_read_async); - if (cancellable) - g_object_ref(cancellable); - input_stream->priv->cancellable = cancellable; + input_stream->priv->task = + g_task_new(stream, cancellable, callback, user_data); input_stream->priv->buffer = buffer; input_stream->priv->count = count; } @@ -181,22 +172,18 @@ static void gvir_input_stream_read_async(GInputStream *stream, static gssize gvir_input_stream_read_finish(GInputStream *stream, GAsyncResult *result, - GError **error G_GNUC_UNUSED) + GError **error) { GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); - GSimpleAsyncResult *simple; virStreamPtr handle; gssize count; g_return_val_if_fail(GVIR_IS_INPUT_STREAM(stream), -1); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(stream), - gvir_input_stream_read_async), - -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); g_object_get(input_stream->priv->stream, "handle", &handle, NULL); - simple = G_SIMPLE_ASYNC_RESULT(result); - - count = g_simple_async_result_get_op_res_gssize(simple); + count = g_task_propagate_int(G_TASK(result), error); virStreamFree(handle); diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index f39328b..a9c1236 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -45,8 +45,7 @@ struct _GVirOutputStreamPrivate GVirStream *stream; /* pending operation metadata */ - GSimpleAsyncResult *result; - GCancellable *cancellable; + GTask *task; const void * buffer; gsize count; }; @@ -103,48 +102,44 @@ gvir_output_stream_write_ready(GVirStream *stream, { GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(opaque); GVirOutputStreamPrivate *priv = output_stream->priv; - GSimpleAsyncResult *simple = priv->result; + GTask *task = priv->task; + GCancellable *cancellable = g_task_get_cancellable(task); GError *error = NULL; gssize result; if (!(cond & GVIR_STREAM_IO_CONDITION_WRITABLE)) { g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be writable"); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); goto cleanup; } result = gvir_stream_send(stream, priv->buffer, priv->count, - priv->cancellable, &error); + cancellable, &error); + + if (error != NULL) { + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be writable"); + } else { + g_task_return_error(task, error); + } - if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { - g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be writable"); goto cleanup; } - if (result >= 0) - g_simple_async_result_set_op_res_gssize(simple, result); - - if (error) - g_simple_async_result_take_error(simple, error); - - if (priv->cancellable) { - g_object_unref(priv->cancellable); - priv->cancellable = NULL; - } + g_task_return_int(task, result); cleanup: - priv->result = NULL; - g_simple_async_result_complete(simple); - g_object_unref(simple); + priv->task = NULL; + g_object_unref(task); return FALSE; } @@ -159,7 +154,7 @@ static void gvir_output_stream_write_async(GOutputStream *stream, GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(stream); g_return_if_fail(GVIR_IS_OUTPUT_STREAM(stream)); - g_return_if_fail(output_stream->priv->result == NULL); + g_return_if_fail(output_stream->priv->task == NULL); gvir_stream_add_watch_full(output_stream->priv->stream, G_PRIORITY_DEFAULT, @@ -168,12 +163,8 @@ static void gvir_output_stream_write_async(GOutputStream *stream, g_object_ref(stream), (GDestroyNotify)g_object_unref); - output_stream->priv->result = - g_simple_async_result_new(G_OBJECT(stream), callback, user_data, - gvir_output_stream_write_async); - if (cancellable) - g_object_ref(cancellable); - output_stream->priv->cancellable = cancellable; + output_stream->priv->task = + g_task_new(stream, cancellable, callback, user_data); output_stream->priv->buffer = buffer; output_stream->priv->count = count; } @@ -181,22 +172,18 @@ static void gvir_output_stream_write_async(GOutputStream *stream, static gssize gvir_output_stream_write_finish(GOutputStream *stream, GAsyncResult *result, - GError **error G_GNUC_UNUSED) + GError **error) { GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(stream); - GSimpleAsyncResult *simple; virStreamPtr handle; gssize count; g_return_val_if_fail(GVIR_IS_OUTPUT_STREAM(stream), -1); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(stream), - gvir_output_stream_write_async), - -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); g_object_get(output_stream->priv->stream, "handle", &handle, NULL); - simple = G_SIMPLE_ASYNC_RESULT(result); - - count = g_simple_async_result_get_op_res_gssize(simple); + count = g_task_propagate_int(G_TASK(result), error); virStreamFree(handle); diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index a0dcebc..6290fcb 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -439,17 +439,18 @@ cleanup: } static void -gvir_storage_pool_refresh_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_refresh_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_refresh(pool, cancellable, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_refresh(pool, cancellable, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -464,20 +465,17 @@ void gvir_storage_pool_refresh_async(GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_refresh_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_refresh_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_refresh_helper); + g_object_unref(task); } /** @@ -490,15 +488,10 @@ gboolean gvir_storage_pool_refresh_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_refresh_async), - FALSE); - - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } static void gvir_storage_vol_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) @@ -658,24 +651,25 @@ typedef struct { guint flags; } StoragePoolBuildData; +static void storage_pool_build_data_free(StoragePoolBuildData *data) +{ + g_slice_free(StoragePoolBuildData, data); +} + static void -gvir_storage_pool_build_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_build_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); - StoragePoolBuildData *data; + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); + StoragePoolBuildData *data = (StoragePoolBuildData *) task_data; GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); - - if (!gvir_storage_pool_build(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_build(pool, data->flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -692,7 +686,7 @@ void gvir_storage_pool_build_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; StoragePoolBuildData *data; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); @@ -701,16 +695,13 @@ void gvir_storage_pool_build_async (GVirStoragePool *pool, data = g_slice_new0(StoragePoolBuildData); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_build_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_build_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, data, (GDestroyNotify)storage_pool_build_data_free); + g_task_run_in_thread(task, gvir_storage_pool_build_helper); + g_object_unref(task); } /** @@ -726,16 +717,10 @@ gboolean gvir_storage_pool_build_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_build_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -762,17 +747,18 @@ gboolean gvir_storage_pool_undefine (GVirStoragePool *pool, } static void -gvir_storage_pool_undefine_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_undefine_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_undefine(pool, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_undefine(pool, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -787,20 +773,17 @@ void gvir_storage_pool_undefine_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_undefine_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_undefine_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_undefine_helper); + g_object_unref(task); } /** @@ -816,16 +799,10 @@ gboolean gvir_storage_pool_undefine_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_undefine_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -854,23 +831,21 @@ gboolean gvir_storage_pool_start (GVirStoragePool *pool, } static void -gvir_storage_pool_start_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_start_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); StoragePoolBuildData *data; GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); + data = (StoragePoolBuildData *) task_data; - if (!gvir_storage_pool_start(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_start(pool, data->flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -887,7 +862,7 @@ void gvir_storage_pool_start_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; StoragePoolBuildData *data; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); @@ -896,16 +871,13 @@ void gvir_storage_pool_start_async (GVirStoragePool *pool, data = g_slice_new0(StoragePoolBuildData); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_start_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_start_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, data, (GDestroyNotify)storage_pool_build_data_free); + g_task_run_in_thread(task, gvir_storage_pool_start_helper); + g_object_unref(task); } /** @@ -921,16 +893,10 @@ gboolean gvir_storage_pool_start_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_start_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -957,17 +923,18 @@ gboolean gvir_storage_pool_stop (GVirStoragePool *pool, } static void -gvir_storage_pool_stop_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_stop_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_stop(pool, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_stop(pool, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -982,20 +949,17 @@ void gvir_storage_pool_stop_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_stop_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_stop_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_stop_helper); + g_object_unref(task); } /** @@ -1011,16 +975,10 @@ gboolean gvir_storage_pool_stop_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_stop_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1100,23 +1058,21 @@ gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, } static void -gvir_storage_pool_delete_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_delete_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); StoragePoolBuildData *data; GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); + data = (StoragePoolBuildData *) task_data; - if (!gvir_storage_pool_delete(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_delete(pool, data->flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -1133,7 +1089,7 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; StoragePoolBuildData *data; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); @@ -1142,16 +1098,13 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, data = g_slice_new0(StoragePoolBuildData); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_delete_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_delete_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, data, (GDestroyNotify)storage_pool_build_data_free); + g_task_run_in_thread(task, gvir_storage_pool_delete_helper); + g_object_unref(task); } /** @@ -1167,16 +1120,10 @@ gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_delete_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } G_GNUC_INTERNAL void gvir_storage_pool_delete_vol(GVirStoragePool *pool, diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 46dbd9a..2a8fbd5 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -129,14 +129,11 @@ static gboolean gvir_stream_close(GIOStream *io_stream, return (i_ret && o_ret); } - -static void gvir_stream_close_async(GIOStream *stream, - int io_priority G_GNUC_UNUSED, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +static gboolean close_in_idle (gpointer data) { - GSimpleAsyncResult *res; + GTask *task = G_TASK (data); + GIOStream *stream = G_IO_STREAM(g_task_get_source_object (task)); + GCancellable *cancellable = g_task_get_cancellable (task); GIOStreamClass *class; GError *error; @@ -146,27 +143,41 @@ static void gvir_stream_close_async(GIOStream *stream, error = NULL; if (class->close_fn && !class->close_fn(stream, cancellable, &error)) { - g_simple_async_report_take_gerror_in_idle(G_OBJECT (stream), - callback, user_data, - error); - return; + g_task_return_error(task, error); + return FALSE; } - res = g_simple_async_result_new(G_OBJECT (stream), - callback, - user_data, - gvir_stream_close_async); - g_simple_async_result_complete_in_idle(res); - g_object_unref (res); + g_task_return_boolean(task, TRUE); + + return FALSE; } +static void gvir_stream_close_async(GIOStream *stream, + int io_priority G_GNUC_UNUSED, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + + task = g_task_new(G_OBJECT(stream), + cancellable, + callback, + user_data); + g_idle_add(close_in_idle, task); + g_object_unref(task); +} static gboolean -gvir_stream_close_finish(GIOStream *stream G_GNUC_UNUSED, - GAsyncResult *result G_GNUC_UNUSED, - GError **error G_GNUC_UNUSED) +gvir_stream_close_finish(GIOStream *stream, + GAsyncResult *result, + GError **error) { - return TRUE; + g_return_val_if_fail(GVIR_IS_STREAM(stream), -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); + + return g_task_propagate_boolean(G_TASK(result), error); } -- 2.5.0

2 2

[libvirt] [PATCH v3 0/7] qemu: Add support for -incoming defer
by Jiri Denemark 25 Nov '15

25 Nov '15

Traditionally, we pass incoming migration URI on QEMU command line, which has some drawbacks. Depending on the URI QEMU may initialize its migration state immediately without giving us a chance to set any additional migration parameters (this applies mainly for fd: URIs). For some URIs the monitor may be completely blocked from the beginning until migration is finished, which means we may be stuck in qmp_capabilities command without being able to send any QMP commands. QEMU solved this by introducing "defer" parameter for -incoming command line option. This will tell QEMU to prepare for an incoming migration while the actual incoming URI is sent using migrate-incoming QMP command. Before calling this command we can normally talk to the monitor and even set any migration parameters which will be honored by the incoming migration. Jiri Denemark (7): qemu: Introduce qemuProcessInit qemu: Introduce qemuProcessLaunch qemu: Introduce qemuProcessFinishStartup qemu: Separate incoming URI generation from qemuMigrationPrepareAny qemu: Kill QEMU process if Prepare phase fails qemu: Skip starting NBD servers for offline migration qemu: Use qemuProcessLaunch in migration Prepare phase src/qemu/qemu_migration.c | 247 +++++++++++++---------- src/qemu/qemu_process.c | 489 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_process.h | 20 ++ 3 files changed, 466 insertions(+), 290 deletions(-) -- 2.6.3

2 9

[libvirt] [PATCHv5 0/9] Hyper-v crash feature support
by Dmitry Andreev 25 Nov '15

25 Nov '15

A new Hyper-V cpu feature 'hv_crash' was added to QEMU. The feature will become available in v2.5.0. What is changed in v5: * minor code fixes * code was moved between patches * patch sequence changed Dmitry Andreev (9): conf: refactor code for checking ABI stability of panic device conf: add 'model' attribute for panic device with values isa, pseries, hyperv tests: add tests for the new panic device attribute - 'model' qemu: add support for hv_crash feature as a panic device tests: rework tests for panic devices tests: add tests for the new 'hyperv' panic device model Allow multiple panic devices tests: add tests for multiple panic devices conf: reject multiple panic devices of same model docs/formatdomain.html.in | 19 +++- docs/schemas/domaincommon.rng | 13 ++- src/conf/domain_conf.c | 123 +++++++++++++-------- src/conf/domain_conf.h | 15 ++- src/qemu/qemu_command.c | 80 ++++++++++++-- src/qemu/qemu_domain.c | 30 ++++- tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-hyperv-panic.args | 21 ++++ .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 25 +++++ .../qemuxml2argv-panic-double.args | 21 ++++ .../qemuxml2argvdata/qemuxml2argv-panic-double.xml | 28 +++++ tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml | 31 ++++++ .../qemuxml2argv-panic-no-address.xml | 2 +- .../qemuxml2argv-panic-pseries.xml | 30 +++++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- .../qemuxml2argv-pseries-nvram.xml | 2 +- tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 31 ++++++ .../qemuxml2xmlout-pseries-panic-missing.xml | 2 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 30 +++++ tests/qemuxml2xmltest.c | 8 +- 21 files changed, 448 insertions(+), 69 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-double.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-double.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-pseries.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml -- 1.8.3.1

2 19

[libvirt] "migration_address must not be the address of the local machine: 127.0.0.1"
by Laszlo Ersek 25 Nov '15

25 Nov '15

I recently upgraded my laptop from RHEL-7.1 to RHEL-7.2. I always pay attention to *.rpmnew config files, and I manually diff and merge them with the ones I have in place. I did the same with "/etc/libvirt/qemu.conf" this time. Now libvirtd doesn't start for me. Systemd doesn't actually notice the startup failure (insert bitter joke about systemd being so much better than startup scripts); it only reports the service inactive/dead (= unstarted), rather than failed. But, the libvirtd log file gives the reason: migration_address must not be the address of the local machine: 127.0.0.1 The error is easy to fix up in the config file, but my question is: Why must migration_address not be the address of the local machine? This comes from: commit 5e0561e115de10da342296bb7c7361e91e368d9c Author: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> Date: Tue Oct 7 12:07:32 2014 +0800 conf: Check whether migration_address is localhost When enabling the migration_address option, by default it is set to "127.0.0.1", but it's not a valid address for migration. so we should add verification and set the default migration_address to "0.0.0.0". Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> I checked the mailing list archive. AFAICS, the earliest appearance of this check is: https://www.redhat.com/archives/libvir-list/2014-August/msg01503.html The validity of the proposed check was never questioned, nor explained. What gives? BTW, my purpose is not in-host migration (perhaps that's indeed unsupported, I don't know); I just want to lock down the incoming migration port (and not just with firewall rules). If there's a way to disable incoming migration in libvirtd, I'd be interested in that. Thanks! Laszlo

3 5

[libvirt] ANNOUNCE: virt-manager 1.3.0 released
by Cole Robinson 25 Nov '15

25 Nov '15

I'm happy to announce the release of virt-manager 1.3.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - Git hosting moved to http://github.com/virt-manager/virt-manager - Switch translation infrastructure from transifex to fedora.zanata.org - Add dogtail UI tests and infrastructure - Improved support for s390x kvm (Kevin Zhao) - virt-install and virt-manager now remove created disk images if VM install startup fails - Replace urlgrabber usage with requests and urllib2 - virt-install: add --network virtualport support for openvswitch (Daniel P. Berrange) - virt-install: support multiple --security labels - virt-install: support --features kvm_hidden=on|off (Pavel Hrdina) - virt-install: add --features pmu=on|off - virt-install: add --features pvspinlock=on|off (Abhijeet Kasurde) - virt-install: add --events on_lockfailure=on|off (Abhijeet Kasurde) - virt-install: add --network link_state=up|down - virt-install: add --vcpu placement=static|auto Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

3 2

[libvirt] [PATCH v2 0/7] qemu: Add support for -incoming defer
by Jiri Denemark 25 Nov '15

25 Nov '15

Traditionally, we pass incoming migration URI on QEMU command line, which has some drawbacks. Depending on the URI QEMU may initialize its migration state immediately without giving us a chance to set any additional migration parameters (this applies mainly for fd: URIs). For some URIs the monitor may be completely blocked from the beginning until migration is finished, which means we may be stuck in qmp_capabilities command without being able to send any QMP commands. QEMU solved this by introducing "defer" parameter for -incoming command line option. This will tell QEMU to prepare for an incoming migration while the actual incoming URI is sent using migrate-incoming QMP command. Before calling this command we can normally talk to the monitor and even set any migration parameters which will be honored by the incoming migration. The first 17 patches from the original series were already pushed. This is the rest of the series. See individual patches for changes from previous version. Jiri Denemark (7): qemu: Introduce qemuProcessInit qemu: Introduce qemuProcessLaunch qemu: Introduce qemuProcessFinishStartup qemu: Separate incoming URI generation from qemuMigrationPrepareAny qemu: Kill QEMU process if Prepare phase fails qemu: Skip starting NBD servers for offline migration qemu: Use qemuProcessLaunch in migration Prepare phase src/qemu/qemu_migration.c | 250 ++++++++++++++---------- src/qemu/qemu_process.c | 488 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_process.h | 19 ++ 3 files changed, 467 insertions(+), 290 deletions(-) -- 2.6.3

2 13

[libvirt] [PATCH] apparmor: add missing qemu binaries
by Guido Günther 25 Nov '15

25 Nov '15

This adds the qemu binaries as of 1.2.4 in Debian. It also removes a duplicate sparc64 entry. --- examples/apparmor/libvirt-qemu | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index c80ece7..efb4873 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -75,9 +75,12 @@ /usr/bin/kvm rmix, /usr/bin/qemu rmix, /usr/bin/qemu-kvm rmix, + /usr/bin/qemu-system-aarch64 rmix, + /usr/bin/qemu-system-alpha rmix, /usr/bin/qemu-system-arm rmix, /usr/bin/qemu-system-cris rmix, /usr/bin/qemu-system-i386 rmix, + /usr/bin/qemu-system-lm32 rmix, /usr/bin/qemu-system-m68k rmix, /usr/bin/qemu-system-microblaze rmix, /usr/bin/qemu-system-microblazeel rmix, @@ -85,14 +88,22 @@ /usr/bin/qemu-system-mips64 rmix, /usr/bin/qemu-system-mips64el rmix, /usr/bin/qemu-system-mipsel rmix, + /usr/bin/qemu-system-moxie rmix, + /usr/bin/qemu-system-or32 rmix, /usr/bin/qemu-system-ppc rmix, /usr/bin/qemu-system-ppc64 rmix, /usr/bin/qemu-system-ppcemb rmix, + /usr/bin/qemu-system-s390x rmix, /usr/bin/qemu-system-sh4 rmix, /usr/bin/qemu-system-sh4eb rmix, /usr/bin/qemu-system-sparc rmix, /usr/bin/qemu-system-sparc64 rmix, + /usr/bin/qemu-system-tricore rmix, + /usr/bin/qemu-system-unicore32 rmix, /usr/bin/qemu-system-x86_64 rmix, + /usr/bin/qemu-system-xtensa rmix, + /usr/bin/qemu-system-xtensaeb rmix, + /usr/bin/qemu-aarch64 rmix, /usr/bin/qemu-alpha rmix, /usr/bin/qemu-arm rmix, /usr/bin/qemu-armeb rmix, @@ -102,16 +113,24 @@ /usr/bin/qemu-microblaze rmix, /usr/bin/qemu-microblazeel rmix, /usr/bin/qemu-mips rmix, + /usr/bin/qemu-mips64 rmix, + /usr/bin/qemu-mips64el rmix, /usr/bin/qemu-mipsel rmix, + /usr/bin/qemu-mipsn32 rmix, + /usr/bin/qemu-mipsn32el rmix, + /usr/bin/qemu-nbd rmix, + /usr/bin/qemu-or32 rmix, /usr/bin/qemu-ppc rmix, /usr/bin/qemu-ppc64 rmix, /usr/bin/qemu-ppc64abi32 rmix, + /usr/bin/qemu-ppc64le rmix, + /usr/bin/qemu-s390x rmix, /usr/bin/qemu-sh4 rmix, /usr/bin/qemu-sh4eb rmix, /usr/bin/qemu-sparc rmix, - /usr/bin/qemu-sparc64 rmix, /usr/bin/qemu-sparc32plus rmix, /usr/bin/qemu-sparc64 rmix, + /usr/bin/qemu-unicore32 rmix, /usr/bin/qemu-x86_64 rmix, /usr/{lib,lib64}/qemu/block-curl.so mr, /usr/{lib,lib64}/qemu/block-rbd.so mr, -- 2.6.2

2 2

[libvirt] how to know if PCI device has SR-IOV PF capability
by Moshe Levi 25 Nov '15

25 Nov '15

Hi, I was looking on the output of virsh nodedev-dumpxml on a PCI to see if it has SR-IOV PF capability. It seem that if the virtual functions are enables the xml look like [1] but if the PCI has no VFs enabled the output is like in [2]. As you can see for PCI which has no VFs the <capability type='virt_functions'> tag doen't exist. Is this by design? I would except that <capability type='virt_functions'/> tag with empty elements will also be include in that case. Thanks, Moshe Levi. [1] root@r-ufm152:~# virsh nodedev-dumpxml pci_0000_03_00_0 <device> <name>pci_0000_03_00_0</name> <path>/sys/devices/pci0000:00/0000:00:02.0/0000:03:00.0</path> <parent>pci_0000_00_02_0</parent> <driver> <name>mlx5_core</name> </driver> <capability type='pci'> <domain>0</domain> <bus>3</bus> <slot>0</slot> <function>0</function> <product id='0x1013'>MT27700 Family [ConnectX-4]</product> <vendor id='0x15b3'>Mellanox Technologies</vendor> <capability type='virt_functions'> <address domain='0x0000' bus='0x03' slot='0x00' function='0x2'/> <address domain='0x0000' bus='0x03' slot='0x00' function='0x3'/> <address domain='0x0000' bus='0x03' slot='0x00' function='0x4'/> <address domain='0x0000' bus='0x03' slot='0x00' function='0x5'/> </capability> <iommuGroup number='15'> <address domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> <address domain='0x0000' bus='0x03' slot='0x00' function='0x1'/> </iommuGroup> <numa node='0'/> <pci-express> <link validity='cap' port='0' speed='8' width='16'/> <link validity='sta' speed='8' width='16'/> </pci-express> </capability> </device> [2] root@r-ufm152:~# virsh nodedev-dumpxml pci_0000_03_00_1 <device> <name>pci_0000_03_00_1</name> <path>/sys/devices/pci0000:00/0000:00:02.0/0000:03:00.1</path> <parent>pci_0000_00_02_0</parent> <driver> <name>mlx5_core</name> </driver> <capability type='pci'> <domain>0</domain> <bus>3</bus> <slot>0</slot> <function>1</function> <product id='0x1013'>MT27700 Family [ConnectX-4]</product> <vendor id='0x15b3'>Mellanox Technologies</vendor> <iommuGroup number='15'> <address domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> <address domain='0x0000' bus='0x03' slot='0x00' function='0x1'/> </iommuGroup> <numa node='0'/> <pci-express> <link validity='cap' port='0' speed='8' width='16'/> <link validity='sta' speed='8' width='16'/> </pci-express> </capability> </device>

3 6

[libvirt] [PATCH java] Add support for Libvirt Qemu Library
by Wido den Hollander 25 Nov '15

25 Nov '15

This allows us to send Qemu Guest Agent commands to running domains. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/main/java/org/libvirt/Domain.java | 36 ++++++++++++++++++++++++++ src/main/java/org/libvirt/Library.java | 3 +++ src/main/java/org/libvirt/jna/LibvirtQemu.java | 16 ++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 src/main/java/org/libvirt/jna/LibvirtQemu.java diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 83a500c..c24df48 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -8,6 +8,7 @@ import org.libvirt.jna.CString; import org.libvirt.jna.DomainPointer; import org.libvirt.jna.DomainSnapshotPointer; import org.libvirt.jna.Libvirt; +import org.libvirt.jna.LibvirtQemu; import org.libvirt.jna.SizeT; import org.libvirt.jna.virDomainBlockInfo; import org.libvirt.jna.virDomainBlockStats; @@ -22,6 +23,7 @@ import org.libvirt.event.LifecycleListener; import org.libvirt.event.PMWakeupListener; import org.libvirt.event.PMSuspendListener; import static org.libvirt.Library.libvirt; +import static org.libvirt.Library.libvirtqemu; import static org.libvirt.ErrorHandler.processError; import static org.libvirt.ErrorHandler.processErrorIfZero; @@ -141,6 +143,23 @@ public class Domain { public static final int NO_METADATA = (1 << 4); } + static final class QemuAgentFlags { + /** + * Do not wait for a result + */ + public static final int VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = 0; + + /** + * Use default timeout value + */ + public static final int VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = -1; + + /** + * Block forever waiting for a result + */ + public static final int VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = -2; + } + /** * the native virDomainPtr. */ @@ -1556,4 +1575,21 @@ public class Domain { return processError(libvirt.virDomainUpdateDeviceFlags(VDP, xml, flags)); } + /** + * Send a Qemu Guest Agent command to a domain + * + * @param cmd + * The command which has to be send + * @param timeout + * The timeout for waiting on an answer. See QemuAgentFlags for more information. + * @param flags + * Flags to be send + * @return String + * @throws LibvirtException + */ + public String qemuAgentCommand(String cmd, int timeout, int flags) throws LibvirtException { + CString result = libvirtqemu.virDomainQemuAgentCommand(this.VDP, cmd, timeout, flags); + processError(result); + return result.toString(); + } } diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 8e054c6..30f15be 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.Libvirt.VirEventTimeoutCallback; +import org.libvirt.jna.LibvirtQemu; import org.libvirt.jna.CString; import static org.libvirt.ErrorHandler.processError; @@ -34,6 +35,7 @@ public final class Library { }; final static Libvirt libvirt; + final static LibvirtQemu libvirtqemu; // an empty string array constant // prefer this over creating empty arrays dynamically. @@ -47,6 +49,7 @@ public final class Library { } catch (Exception e) { e.printStackTrace(); } + libvirtqemu = LibvirtQemu.INSTANCE; } private Library() {} diff --git a/src/main/java/org/libvirt/jna/LibvirtQemu.java b/src/main/java/org/libvirt/jna/LibvirtQemu.java new file mode 100644 index 0000000..82213e9 --- /dev/null +++ b/src/main/java/org/libvirt/jna/LibvirtQemu.java @@ -0,0 +1,16 @@ +package org.libvirt.jna; + +import com.sun.jna.Library; +import com.sun.jna.Native; +import com.sun.jna.Platform; + +/** + * The libvirt Qemu interface which is exposed via JNA + */ + +public interface LibvirtQemu extends Library { + + LibvirtQemu INSTANCE = (LibvirtQemu) Native.loadLibrary(Platform.isWindows() ? "virt-qemu-0" : "virt-qemu", LibvirtQemu.class); + + CString virDomainQemuAgentCommand(DomainPointer virDomainPtr, String cmd, int timeout, int flags); +} -- 1.9.1

2 6

[libvirt] [libvirt-glib v3] gobject: Port to GTask API
by Zeeshan Ali (Khattak) 24 Nov '15

24 Nov '15

Drop usage of deprecated GSimpleAsyncResult API. --- libvirt-gobject/libvirt-gobject-domain.c | 290 +++++++++--------------- libvirt-gobject/libvirt-gobject-input-stream.c | 77 +++---- libvirt-gobject/libvirt-gobject-output-stream.c | 75 +++--- libvirt-gobject/libvirt-gobject-storage-pool.c | 281 ++++++++++------------- libvirt-gobject/libvirt-gobject-stream.c | 52 +++-- 5 files changed, 322 insertions(+), 453 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 5509ce3..c768cd3 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -370,28 +370,20 @@ gboolean gvir_domain_start(GVirDomain *dom, return TRUE; } -typedef struct { - guint flags; -} DomainStartData; - -static void domain_start_data_free(DomainStartData *data) -{ - g_slice_free(DomainStartData, data); -} - static void -gvir_domain_start_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_start_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainStartData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer(res); - - if (!gvir_domain_start(dom, data->flags, &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_start(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -410,25 +402,18 @@ void gvir_domain_start_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - DomainStartData *data; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(DomainStartData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_start_async); - g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)domain_start_data_free); - g_simple_async_result_run_in_thread(res, - gvir_domain_start_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_start_helper); + g_object_unref(task); } gboolean gvir_domain_start_finish(GVirDomain *dom, @@ -436,13 +421,10 @@ gboolean gvir_domain_start_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_start_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -472,15 +454,18 @@ gboolean gvir_domain_resume(GVirDomain *dom, } static void -gvir_domain_resume_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_resume_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); GError *err = NULL; if (!gvir_domain_resume(dom, &err)) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -497,20 +482,17 @@ void gvir_domain_resume_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_resume_async); - g_simple_async_result_run_in_thread(res, - gvir_domain_resume_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_domain_resume_helper); + g_object_unref(task); } gboolean gvir_domain_resume_finish(GVirDomain *dom, @@ -518,13 +500,10 @@ gboolean gvir_domain_resume_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_resume_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -556,15 +535,19 @@ gboolean gvir_domain_wakeup(GVirDomain *dom, } static void -gvir_domain_wakeup_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_wakeup_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - if (!gvir_domain_wakeup(dom, (guint)g_simple_async_result_get_op_res_gssize(res), &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_wakeup(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -583,21 +566,18 @@ void gvir_domain_wakeup_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_wakeup_async); - g_simple_async_result_set_op_res_gssize (res, (gssize)flags); - g_simple_async_result_run_in_thread(res, - gvir_domain_wakeup_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_wakeup_helper); + g_object_unref(task); } gboolean gvir_domain_wakeup_finish(GVirDomain *dom, @@ -605,13 +585,10 @@ gboolean gvir_domain_wakeup_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_wakeup_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -785,18 +762,19 @@ static void domain_save_to_file_data_free(DomainSaveToFileData *data) } static void -gvir_domain_save_to_file_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_save_to_file_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainSaveToFileData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + DomainSaveToFileData *data = (DomainSaveToFileData *) task_data; GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer(res); - if (!gvir_domain_save_to_file(dom, data->filename, data->custom_conf, data->flags, &err)) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -819,7 +797,7 @@ void gvir_domain_save_to_file_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; DomainSaveToFileData *data; g_return_if_fail(GVIR_IS_DOMAIN(dom)); @@ -832,19 +810,15 @@ void gvir_domain_save_to_file_async(GVirDomain *dom, data->custom_conf = g_object_ref(custom_conf); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_save_to_file_async); - g_simple_async_result_set_op_res_gpointer(res, data, (GDestroyNotify) - domain_save_to_file_data_free); - - g_simple_async_result_run_in_thread(res, - gvir_domain_save_to_file_helper, - G_PRIORITY_DEFAULT, - cancellable); - - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, + data, + (GDestroyNotify) domain_save_to_file_data_free); + g_task_run_in_thread(task, gvir_domain_save_to_file_helper); + g_object_unref(task); } /** @@ -862,16 +836,10 @@ gboolean gvir_domain_save_to_file_finish(GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid - (result, - G_OBJECT(dom), - gvir_domain_save_to_file_async), FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1012,22 +980,22 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, } static void -gvir_domain_get_info_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_get_info_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomain *dom = GVIR_DOMAIN(source_object); GVirDomainInfo *info; GError *err = NULL; info = gvir_domain_get_info(dom, &err); if (err) - g_simple_async_result_take_error(res, err); + g_task_return_error(task, err); else - g_simple_async_result_set_op_res_gpointer - (res, - info, - (GDestroyNotify) gvir_domain_info_free); + g_task_return_pointer(task, + info, + (GDestroyNotify) gvir_domain_info_free); } /** @@ -1044,20 +1012,17 @@ void gvir_domain_get_info_async(GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_get_info_async); - g_simple_async_result_run_in_thread(res, - gvir_domain_get_info_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_domain_get_info_helper); + g_object_unref(task); } /** @@ -1075,22 +1040,11 @@ GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, GAsyncResult *result, GError **err) { - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); - GVirDomainInfo *ret; - g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); - g_return_val_if_fail - (g_simple_async_result_is_valid(result, - G_OBJECT(dom), - gvir_domain_get_info_async), - NULL); - - if (g_simple_async_result_propagate_error(res, err)) - return NULL; - - ret = g_simple_async_result_get_op_res_gpointer(res); + g_return_val_if_fail(g_task_is_valid(result, dom), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); - return gvir_domain_info_copy (ret); + return g_task_propagate_pointer(G_TASK(result), err); } /** @@ -1365,28 +1319,20 @@ gboolean gvir_domain_save (GVirDomain *dom, return TRUE; } -typedef struct { - guint flags; -} DomainSaveData; - -static void domain_save_data_free(DomainSaveData *data) -{ - g_slice_free (DomainSaveData, data); -} - static void -gvir_domain_save_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_domain_save_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirDomain *dom = GVIR_DOMAIN(object); - DomainSaveData *data; + GVirDomain *dom = GVIR_DOMAIN(source_object); + guint flags = GPOINTER_TO_UINT(task_data); GError *err = NULL; - data = g_simple_async_result_get_op_res_gpointer (res); - - if (!gvir_domain_save(dom, data->flags, &err)) - g_simple_async_result_take_error(res, err); + if (!gvir_domain_save(dom, flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -1405,25 +1351,18 @@ void gvir_domain_save_async (GVirDomain *dom, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - DomainSaveData *data; + GTask *task; g_return_if_fail(GVIR_IS_DOMAIN(dom)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - data = g_slice_new0(DomainSaveData); - data->flags = flags; - - res = g_simple_async_result_new(G_OBJECT(dom), - callback, - user_data, - gvir_domain_save_async); - g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify) domain_save_data_free); - g_simple_async_result_run_in_thread(res, - gvir_domain_save_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + g_task_set_task_data(task, GUINT_TO_POINTER(flags), NULL); + g_task_run_in_thread(task, gvir_domain_save_helper); + g_object_unref(task); } /** @@ -1441,15 +1380,10 @@ gboolean gvir_domain_save_finish (GVirDomain *dom, GError **err) { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), - gvir_domain_save_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, dom), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1682,6 +1616,7 @@ GVirDomainSnapshot *gvir_domain_create_snapshot_finish(GVirDomain *domain, GError **error) { g_return_val_if_fail(g_task_is_valid(result, domain), NULL); + g_return_val_if_fail(error == NULL || *error == NULL, NULL); return g_task_propagate_pointer(G_TASK(result), error); } @@ -1847,6 +1782,7 @@ gboolean gvir_domain_fetch_snapshots_finish(GVirDomain *dom, { g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); g_return_val_if_fail(g_task_is_valid(res, dom), FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); return g_task_propagate_boolean(G_TASK(res), error); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index ff1a70c..cd107e1 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -45,8 +45,7 @@ struct _GVirInputStreamPrivate GVirStream *stream; /* pending operation metadata */ - GSimpleAsyncResult *result; - GCancellable *cancellable; + GTask *task; gpointer buffer; gsize count; }; @@ -103,48 +102,44 @@ gvir_input_stream_read_ready(GVirStream *stream, { GVirInputStream *input_stream = GVIR_INPUT_STREAM(opaque); GVirInputStreamPrivate *priv = input_stream->priv; - GSimpleAsyncResult *simple = priv->result; + GTask *task = priv->task; + GCancellable *cancellable = g_task_get_cancellable(task); GError *error = NULL; gssize result; + priv->task = NULL; + if (!(cond & GVIR_STREAM_IO_CONDITION_READABLE)) { g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be readable"); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); goto cleanup; } - result = gvir_stream_receive(stream, priv->buffer, priv->count, - priv->cancellable, &error); + result = gvir_stream_receive(stream, priv->buffer, priv->count, + cancellable, &error); + if (error != NULL) { + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); + } else { + g_task_return_error(task, error); + } - if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { - g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be readable"); goto cleanup; } - if (result >= 0) - g_simple_async_result_set_op_res_gssize(simple, result); - - if (error) - g_simple_async_result_take_error(simple, error); - - if (priv->cancellable) { - g_object_unref(priv->cancellable); - priv->cancellable = NULL; - } + g_task_return_int(task, result); cleanup: - priv->result = NULL; - g_simple_async_result_complete(simple); - g_object_unref(simple); + g_object_unref(task); return FALSE; } @@ -159,7 +154,7 @@ static void gvir_input_stream_read_async(GInputStream *stream, GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); g_return_if_fail(GVIR_IS_INPUT_STREAM(stream)); - g_return_if_fail(input_stream->priv->result == NULL); + g_return_if_fail(input_stream->priv->task == NULL); gvir_stream_add_watch_full(input_stream->priv->stream, G_PRIORITY_DEFAULT, @@ -168,12 +163,8 @@ static void gvir_input_stream_read_async(GInputStream *stream, g_object_ref(stream), (GDestroyNotify)g_object_unref); - input_stream->priv->result = - g_simple_async_result_new(G_OBJECT(stream), callback, user_data, - gvir_input_stream_read_async); - if (cancellable) - g_object_ref(cancellable); - input_stream->priv->cancellable = cancellable; + input_stream->priv->task = + g_task_new(stream, cancellable, callback, user_data); input_stream->priv->buffer = buffer; input_stream->priv->count = count; } @@ -181,22 +172,18 @@ static void gvir_input_stream_read_async(GInputStream *stream, static gssize gvir_input_stream_read_finish(GInputStream *stream, GAsyncResult *result, - GError **error G_GNUC_UNUSED) + GError **error) { GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); - GSimpleAsyncResult *simple; virStreamPtr handle; gssize count; g_return_val_if_fail(GVIR_IS_INPUT_STREAM(stream), -1); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(stream), - gvir_input_stream_read_async), - -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); g_object_get(input_stream->priv->stream, "handle", &handle, NULL); - simple = G_SIMPLE_ASYNC_RESULT(result); - - count = g_simple_async_result_get_op_res_gssize(simple); + count = g_task_propagate_int(G_TASK(result), error); virStreamFree(handle); diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index f39328b..a9c1236 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -45,8 +45,7 @@ struct _GVirOutputStreamPrivate GVirStream *stream; /* pending operation metadata */ - GSimpleAsyncResult *result; - GCancellable *cancellable; + GTask *task; const void * buffer; gsize count; }; @@ -103,48 +102,44 @@ gvir_output_stream_write_ready(GVirStream *stream, { GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(opaque); GVirOutputStreamPrivate *priv = output_stream->priv; - GSimpleAsyncResult *simple = priv->result; + GTask *task = priv->task; + GCancellable *cancellable = g_task_get_cancellable(task); GError *error = NULL; gssize result; if (!(cond & GVIR_STREAM_IO_CONDITION_WRITABLE)) { g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be writable"); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be readable"); goto cleanup; } result = gvir_stream_send(stream, priv->buffer, priv->count, - priv->cancellable, &error); + cancellable, &error); + + if (error != NULL) { + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + g_task_return_new_error(task, + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + "%s", + "Expected stream to be writable"); + } else { + g_task_return_error(task, error); + } - if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { - g_warn_if_reached(); - g_simple_async_result_set_error(simple, - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - "%s", - "Expected stream to be writable"); goto cleanup; } - if (result >= 0) - g_simple_async_result_set_op_res_gssize(simple, result); - - if (error) - g_simple_async_result_take_error(simple, error); - - if (priv->cancellable) { - g_object_unref(priv->cancellable); - priv->cancellable = NULL; - } + g_task_return_int(task, result); cleanup: - priv->result = NULL; - g_simple_async_result_complete(simple); - g_object_unref(simple); + priv->task = NULL; + g_object_unref(task); return FALSE; } @@ -159,7 +154,7 @@ static void gvir_output_stream_write_async(GOutputStream *stream, GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(stream); g_return_if_fail(GVIR_IS_OUTPUT_STREAM(stream)); - g_return_if_fail(output_stream->priv->result == NULL); + g_return_if_fail(output_stream->priv->task == NULL); gvir_stream_add_watch_full(output_stream->priv->stream, G_PRIORITY_DEFAULT, @@ -168,12 +163,8 @@ static void gvir_output_stream_write_async(GOutputStream *stream, g_object_ref(stream), (GDestroyNotify)g_object_unref); - output_stream->priv->result = - g_simple_async_result_new(G_OBJECT(stream), callback, user_data, - gvir_output_stream_write_async); - if (cancellable) - g_object_ref(cancellable); - output_stream->priv->cancellable = cancellable; + output_stream->priv->task = + g_task_new(stream, cancellable, callback, user_data); output_stream->priv->buffer = buffer; output_stream->priv->count = count; } @@ -181,22 +172,18 @@ static void gvir_output_stream_write_async(GOutputStream *stream, static gssize gvir_output_stream_write_finish(GOutputStream *stream, GAsyncResult *result, - GError **error G_GNUC_UNUSED) + GError **error) { GVirOutputStream *output_stream = GVIR_OUTPUT_STREAM(stream); - GSimpleAsyncResult *simple; virStreamPtr handle; gssize count; g_return_val_if_fail(GVIR_IS_OUTPUT_STREAM(stream), -1); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(stream), - gvir_output_stream_write_async), - -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); g_object_get(output_stream->priv->stream, "handle", &handle, NULL); - simple = G_SIMPLE_ASYNC_RESULT(result); - - count = g_simple_async_result_get_op_res_gssize(simple); + count = g_task_propagate_int(G_TASK(result), error); virStreamFree(handle); diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index a0dcebc..6290fcb 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -439,17 +439,18 @@ cleanup: } static void -gvir_storage_pool_refresh_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_refresh_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_refresh(pool, cancellable, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_refresh(pool, cancellable, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -464,20 +465,17 @@ void gvir_storage_pool_refresh_async(GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_refresh_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_refresh_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_refresh_helper); + g_object_unref(task); } /** @@ -490,15 +488,10 @@ gboolean gvir_storage_pool_refresh_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_refresh_async), - FALSE); - - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } static void gvir_storage_vol_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) @@ -658,24 +651,25 @@ typedef struct { guint flags; } StoragePoolBuildData; +static void storage_pool_build_data_free(StoragePoolBuildData *data) +{ + g_slice_free(StoragePoolBuildData, data); +} + static void -gvir_storage_pool_build_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_build_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); - StoragePoolBuildData *data; + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); + StoragePoolBuildData *data = (StoragePoolBuildData *) task_data; GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); - - if (!gvir_storage_pool_build(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_build(pool, data->flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -692,7 +686,7 @@ void gvir_storage_pool_build_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; StoragePoolBuildData *data; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); @@ -701,16 +695,13 @@ void gvir_storage_pool_build_async (GVirStoragePool *pool, data = g_slice_new0(StoragePoolBuildData); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_build_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_build_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, data, (GDestroyNotify)storage_pool_build_data_free); + g_task_run_in_thread(task, gvir_storage_pool_build_helper); + g_object_unref(task); } /** @@ -726,16 +717,10 @@ gboolean gvir_storage_pool_build_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_build_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -762,17 +747,18 @@ gboolean gvir_storage_pool_undefine (GVirStoragePool *pool, } static void -gvir_storage_pool_undefine_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_undefine_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_undefine(pool, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_undefine(pool, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -787,20 +773,17 @@ void gvir_storage_pool_undefine_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_undefine_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_undefine_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_undefine_helper); + g_object_unref(task); } /** @@ -816,16 +799,10 @@ gboolean gvir_storage_pool_undefine_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_undefine_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -854,23 +831,21 @@ gboolean gvir_storage_pool_start (GVirStoragePool *pool, } static void -gvir_storage_pool_start_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_start_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); StoragePoolBuildData *data; GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); + data = (StoragePoolBuildData *) task_data; - if (!gvir_storage_pool_start(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_start(pool, data->flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -887,7 +862,7 @@ void gvir_storage_pool_start_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; StoragePoolBuildData *data; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); @@ -896,16 +871,13 @@ void gvir_storage_pool_start_async (GVirStoragePool *pool, data = g_slice_new0(StoragePoolBuildData); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_start_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_start_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, data, (GDestroyNotify)storage_pool_build_data_free); + g_task_run_in_thread(task, gvir_storage_pool_start_helper); + g_object_unref(task); } /** @@ -921,16 +893,10 @@ gboolean gvir_storage_pool_start_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_start_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -957,17 +923,18 @@ gboolean gvir_storage_pool_stop (GVirStoragePool *pool, } static void -gvir_storage_pool_stop_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_stop_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); GError *err = NULL; - if (!gvir_storage_pool_stop(pool, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } + if (!gvir_storage_pool_stop(pool, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -982,20 +949,17 @@ void gvir_storage_pool_stop_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_stop_async); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_stop_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_storage_pool_stop_helper); + g_object_unref(task); } /** @@ -1011,16 +975,10 @@ gboolean gvir_storage_pool_stop_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_stop_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } /** @@ -1100,23 +1058,21 @@ gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, } static void -gvir_storage_pool_delete_helper(GSimpleAsyncResult *res, - GObject *object, +gvir_storage_pool_delete_helper(GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable G_GNUC_UNUSED) { - GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePool *pool = GVIR_STORAGE_POOL(source_object); StoragePoolBuildData *data; GError *err = NULL; - data = (StoragePoolBuildData *) g_object_get_data(G_OBJECT(res), - "StoragePoolBuildData"); + data = (StoragePoolBuildData *) task_data; - if (!gvir_storage_pool_delete(pool, data->flags, &err)) { - g_simple_async_result_set_from_error(res, err); - g_error_free(err); - } - - g_slice_free (StoragePoolBuildData, data); + if (!gvir_storage_pool_delete(pool, data->flags, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); } /** @@ -1133,7 +1089,7 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + GTask *task; StoragePoolBuildData *data; g_return_if_fail(GVIR_IS_STORAGE_POOL(pool)); @@ -1142,16 +1098,13 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, data = g_slice_new0(StoragePoolBuildData); data->flags = flags; - res = g_simple_async_result_new(G_OBJECT(pool), - callback, - user_data, - gvir_storage_pool_delete_async); - g_object_set_data(G_OBJECT(res), "StoragePoolBuildData", data); - g_simple_async_result_run_in_thread(res, - gvir_storage_pool_delete_helper, - G_PRIORITY_DEFAULT, - cancellable); - g_object_unref(res); + task = g_task_new(G_OBJECT(pool), + cancellable, + callback, + user_data); + g_task_set_task_data(task, data, (GDestroyNotify)storage_pool_build_data_free); + g_task_run_in_thread(task, gvir_storage_pool_delete_helper); + g_object_unref(task); } /** @@ -1167,16 +1120,10 @@ gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, GError **err) { g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); - g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(pool), - gvir_storage_pool_delete_async), - FALSE); + g_return_val_if_fail(g_task_is_valid(result, pool), FALSE); g_return_val_if_fail(err == NULL || *err == NULL, FALSE); - if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), - err)) - return FALSE; - - return TRUE; + return g_task_propagate_boolean(G_TASK(result), err); } G_GNUC_INTERNAL void gvir_storage_pool_delete_vol(GVirStoragePool *pool, diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 46dbd9a..a40ac99 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -129,14 +129,13 @@ static gboolean gvir_stream_close(GIOStream *io_stream, return (i_ret && o_ret); } - -static void gvir_stream_close_async(GIOStream *stream, - int io_priority G_GNUC_UNUSED, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +static void +gvir_stream_close_helper(GTask *task, + gpointer source_object, + gpointer task_data G_GNUC_UNUSED, + GCancellable *cancellable) { - GSimpleAsyncResult *res; + GIOStream *stream = G_IO_STREAM(source_object); GIOStreamClass *class; GError *error; @@ -146,27 +145,40 @@ static void gvir_stream_close_async(GIOStream *stream, error = NULL; if (class->close_fn && !class->close_fn(stream, cancellable, &error)) { - g_simple_async_report_take_gerror_in_idle(G_OBJECT (stream), - callback, user_data, - error); + g_task_return_error(task, error); return; } - res = g_simple_async_result_new(G_OBJECT (stream), - callback, - user_data, - gvir_stream_close_async); - g_simple_async_result_complete_in_idle(res); - g_object_unref (res); + g_task_return_boolean(task, TRUE); +} + +static void gvir_stream_close_async(GIOStream *stream, + int io_priority G_GNUC_UNUSED, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + + task = g_task_new(G_OBJECT(stream), + cancellable, + callback, + user_data); + g_task_run_in_thread(task, gvir_stream_close_helper); + g_object_unref(task); } static gboolean -gvir_stream_close_finish(GIOStream *stream G_GNUC_UNUSED, - GAsyncResult *result G_GNUC_UNUSED, - GError **error G_GNUC_UNUSED) +gvir_stream_close_finish(GIOStream *stream, + GAsyncResult *result, + GError **error) { - return TRUE; + g_return_val_if_fail(GVIR_IS_STREAM(stream), -1); + g_return_val_if_fail(g_task_is_valid(result, stream), -1); + g_return_val_if_fail(error == NULL || *error == NULL, -1); + + return g_task_propagate_boolean(G_TASK(result), error); } -- 2.5.0

2 2

[libvirt] [PATCH] storage: Ignore block devices that fail format detection
by John Ferlan 24 Nov '15

24 Nov '15

https://bugzilla.redhat.com/show_bug.cgi?id=1276198 Prior to commit id '98322052' failure to saferead the block device would cause an error to be logged and the device to be skipped while attempting to discover/create a stable target path for a new LUN (NPIV). This was because virStorageBackendSCSIFindLUs ignored errors from processLU and virStorageBackendSCSINewLun. Ignoring the failure allowed a multipath device with an "active" and "ghost" to be present on the host with the "ghost" block device being ignored. This patch will return a -2 to the caller indicating the desire to ignore the block device since it cannot be used directly rather than fail the pool startup. Additionally, it was found during some debugging that it was possible for the virStorageBackendDetectBlockVolFormatFD to not detect a format, which while not a probably - we probably should at least add some sort of warning message. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend.c | 4 ++++ src/storage/storage_backend_scsi.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index a375fe0..2de606f 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1393,6 +1393,10 @@ virStorageBackendDetectBlockVolFormatFD(virStorageSourcePtr target, } } + if (target->format == VIR_STORAGE_POOL_DISK_UNKNOWN) + VIR_WARN("cannot determine the target format for '%s'", + target->path); + return 0; } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index a593a2b..d60473d 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -224,9 +224,14 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, goto cleanup; } + /* Failing to process the format is not fatal - we'll just skip + * this volume. + */ if (virStorageBackendUpdateVolInfo(vol, true, - VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) + VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { + retval = -2; goto cleanup; + } if (!(vol->key = virStorageBackendSCSISerial(vol->target.path))) goto cleanup; -- 2.1.0

2 4

[libvirt] [PATCH 0/6] Add virtio-gpu & virgl support
by Marc-André Lureau 24 Nov '15

24 Nov '15

The following series allow using virtio-gpu and virgl if qemu support it. Ths Spice bits are not yet in qemu 2.5, but should make it in 2.6 and I added the RFC patches that are expected to not change much. Marc-André Lureau (6): qemu: add virtio video device qemu: query virtio-gpu for virgl support tests: add qemu 2.5 caps test tests: add a few qemuxml2argv virtio-gpu tests RFC qemu: add spice opengl support RFC tests: add virgl/spice qemuxml2argv test docs/formatdomain.html.in | 11 +- docs/schemas/domaincommon.rng | 6 + src/conf/domain_conf.c | 14 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 21 + src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 44 +- tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 22 +- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 22 +- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 3 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 95 +- tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 170 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 4043 ++++++++++++++++++++ tests/qemucapabilitiestest.c | 1 + .../qemuxml2argv-video-virtio-gpu-device.args | 23 + .../qemuxml2argv-video-virtio-gpu-device.xml | 29 + .../qemuxml2argv-video-virtio-gpu-nodevice.args | 24 + .../qemuxml2argv-video-virtio-gpu-nodevice.xml | 29 + .../qemuxml2argv-video-virtio-gpu-virgl.args | 23 + .../qemuxml2argv-video-virtio-gpu-virgl.xml | 32 + tests/qemuxml2argvtest.c | 11 + 26 files changed, 4676 insertions(+), 64 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.replies create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-nodevice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-nodevice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.xml -- 2.5.0

3 11