External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed virDomainEventState to virObjectEventState

Browse Source 
Leave virDomainEventRegister and its Deregister brother as these are
legacy functions only for domain lifecycle events.
This commit is contained in:
Cédric Bosdonnat 2013-11-21 11:43:10 +01:00 committed by Daniel P. Berrange
parent df328f9345
commit 146434efad
21 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfg.mk
View File

@ -126,8 +126,8 @@ useless_free_options = \
--name=virDomainDiskDefFree \ --name=virDomainDiskDefFree \
--name=virDomainEventCallbackListFree \ --name=virDomainEventCallbackListFree \
--name=virDomainEventFree \ --name=virDomainEventFree \
--name=virDomainEventQueueFree \ --name=virObjectEventQueueFree \
--name=virDomainEventStateFree \ --name=virObjectEventStateFree \
--name=virDomainFSDefFree \ --name=virDomainFSDefFree \
--name=virDomainGraphicsDefFree \ --name=virDomainGraphicsDefFree \
--name=virDomainHostdevDefFree \ --name=virDomainHostdevDefFree \

100
src/conf/domain_event.c
View File

@ -54,7 +54,7 @@ struct _virObjectEventQueue {
virDomainEventPtr *events; virDomainEventPtr *events;
}; };
struct _virDomainEventState { struct _virObjectEventState {
/* The list of domain event callbacks */ /* The list of domain event callbacks */
virDomainEventCallbackListPtr callbacks; virDomainEventCallbackListPtr callbacks;
/* The queue of object events */ /* The queue of object events */
@ -579,25 +579,25 @@ virObjectEventQueueNew(void)
} }
static void static void
virDomainEventStateLock(virDomainEventStatePtr state) virObjectEventStateLock(virObjectEventStatePtr state)
{ {
virMutexLock(&state->lock); virMutexLock(&state->lock);
} }
static void static void
virDomainEventStateUnlock(virDomainEventStatePtr state) virObjectEventStateUnlock(virObjectEventStatePtr state)
{ {
virMutexUnlock(&state->lock); virMutexUnlock(&state->lock);
} }
/** /**
* virDomainEventStateFree: * virObjectEventStateFree:
* @list: virDomainEventStatePtr to free * @list: virObjectEventStatePtr to free
* *
* Free a virDomainEventStatePtr and its members, and unregister the timer. * Free a virObjectEventStatePtr and its members, and unregister the timer.
*/ */
void void
virDomainEventStateFree(virDomainEventStatePtr state) virObjectEventStateFree(virObjectEventStatePtr state)
{ {
if (!state) if (!state)
return; return;
@ -613,23 +613,23 @@ virDomainEventStateFree(virDomainEventStatePtr state)
} }
static void virDomainEventStateFlush(virDomainEventStatePtr state); static void virObjectEventStateFlush(virObjectEventStatePtr state);
static void static void
virDomainEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque) virDomainEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque)
{ {
virDomainEventStatePtr state = opaque; virObjectEventStatePtr state = opaque;
virDomainEventStateFlush(state); virObjectEventStateFlush(state);
} }
/** /**
* virDomainEventStateNew: * virObjectEventStateNew:
*/ */
virDomainEventStatePtr virObjectEventStatePtr
virDomainEventStateNew(void) virObjectEventStateNew(void)
{ {
virDomainEventStatePtr state = NULL; virObjectEventStatePtr state = NULL;
if (VIR_ALLOC(state) < 0) if (VIR_ALLOC(state) < 0)
goto error; goto error;
@ -652,7 +652,7 @@ virDomainEventStateNew(void)
return state; return state;
error: error:
virDomainEventStateFree(state); virObjectEventStateFree(state);
return NULL; return NULL;
} }
@ -1437,7 +1437,7 @@ virObjectEventQueueDispatch(virObjectEventQueuePtr queue,
} }
void void
virDomainEventStateQueue(virDomainEventStatePtr state, virObjectEventStateQueue(virObjectEventStatePtr state,
virDomainEventPtr event) virDomainEventPtr event)
{ {
if (state->timer < 0) { if (state->timer < 0) {
@ -1445,7 +1445,7 @@ virDomainEventStateQueue(virDomainEventStatePtr state,
return; return;
} }
virDomainEventStateLock(state); virObjectEventStateLock(state);
if (virObjectEventQueuePush(state->queue, event) < 0) { if (virObjectEventQueuePush(state->queue, event) < 0) {
VIR_DEBUG("Error adding event to queue"); VIR_DEBUG("Error adding event to queue");
@ -1454,32 +1454,32 @@ virDomainEventStateQueue(virDomainEventStatePtr state,
if (state->queue->count == 1) if (state->queue->count == 1)
virEventUpdateTimeout(state->timer, 0); virEventUpdateTimeout(state->timer, 0);
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
} }
static void static void
virDomainEventStateDispatchFunc(virConnectPtr conn, virObjectEventStateDispatchFunc(virConnectPtr conn,
virDomainEventPtr event, virDomainEventPtr event,
virConnectDomainEventGenericCallback cb, virConnectDomainEventGenericCallback cb,
void *cbopaque, void *cbopaque,
void *opaque) void *opaque)
{ {
virDomainEventStatePtr state = opaque; virObjectEventStatePtr state = opaque;
/* Drop the lock whle dispatching, for sake of re-entrancy */ /* Drop the lock whle dispatching, for sake of re-entrancy */
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
virDomainEventDispatchDefaultFunc(conn, event, cb, cbopaque, NULL); virDomainEventDispatchDefaultFunc(conn, event, cb, cbopaque, NULL);
virDomainEventStateLock(state); virObjectEventStateLock(state);
} }
static void static void
virDomainEventStateFlush(virDomainEventStatePtr state) virObjectEventStateFlush(virObjectEventStatePtr state)
{ {
virObjectEventQueue tempQueue; virObjectEventQueue tempQueue;
virDomainEventStateLock(state); virObjectEventStateLock(state);
state->isDispatching = true; state->isDispatching = true;
/* Copy the queue, so we're reentrant safe when dispatchFunc drops the /* Copy the queue, so we're reentrant safe when dispatchFunc drops the
@ -1492,21 +1492,21 @@ virDomainEventStateFlush(virDomainEventStatePtr state)
virObjectEventQueueDispatch(&tempQueue, virObjectEventQueueDispatch(&tempQueue,
state->callbacks, state->callbacks,
virDomainEventStateDispatchFunc, virObjectEventStateDispatchFunc,
state); state);
/* Purge any deleted callbacks */ /* Purge any deleted callbacks */
virDomainEventCallbackListPurgeMarked(state->callbacks); virDomainEventCallbackListPurgeMarked(state->callbacks);
state->isDispatching = false; state->isDispatching = false;
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
} }
/** /**
* virDomainEventStateRegister: * virDomainEventStateRegister:
* @conn: connection to associate with callback * @conn: connection to associate with callback
* @state: domain event state * @state: object event state
* @callback: function to remove from event * @callback: function to remove from event
* @opaque: data blob to pass to callback * @opaque: data blob to pass to callback
* @freecb: callback to free @opaque * @freecb: callback to free @opaque
@ -1518,14 +1518,14 @@ virDomainEventStateFlush(virDomainEventStatePtr state)
*/ */
int int
virDomainEventStateRegister(virConnectPtr conn, virDomainEventStateRegister(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
virConnectDomainEventCallback callback, virConnectDomainEventCallback callback,
void *opaque, void *opaque,
virFreeCallback freecb) virFreeCallback freecb)
{ {
int ret = -1; int ret = -1;
virDomainEventStateLock(state); virObjectEventStateLock(state);
if ((state->callbacks->count == 0) && if ((state->callbacks->count == 0) &&
(state->timer == -1) && (state->timer == -1) &&
@ -1549,7 +1549,7 @@ virDomainEventStateRegister(virConnectPtr conn,
} }
cleanup: cleanup:
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
return ret; return ret;
} }
@ -1557,7 +1557,7 @@ cleanup:
/** /**
* virDomainEventStateRegisterID: * virDomainEventStateRegisterID:
* @conn: connection to associate with callback * @conn: connection to associate with callback
* @state: domain event state * @state: object event state
* @eventID: ID of the event type to register for * @eventID: ID of the event type to register for
* @cb: function to remove from event * @cb: function to remove from event
* @opaque: data blob to pass to callback * @opaque: data blob to pass to callback
@ -1571,7 +1571,7 @@ cleanup:
*/ */
int int
virDomainEventStateRegisterID(virConnectPtr conn, virDomainEventStateRegisterID(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
virDomainPtr dom, virDomainPtr dom,
int eventID, int eventID,
virConnectDomainEventGenericCallback cb, virConnectDomainEventGenericCallback cb,
@ -1581,7 +1581,7 @@ virDomainEventStateRegisterID(virConnectPtr conn,
{ {
int ret = -1; int ret = -1;
virDomainEventStateLock(state); virObjectEventStateLock(state);
if ((state->callbacks->count == 0) && if ((state->callbacks->count == 0) &&
(state->timer == -1) && (state->timer == -1) &&
@ -1606,7 +1606,7 @@ virDomainEventStateRegisterID(virConnectPtr conn,
} }
cleanup: cleanup:
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
return ret; return ret;
} }
@ -1614,7 +1614,7 @@ cleanup:
/** /**
* virDomainEventStateDeregister: * virDomainEventStateDeregister:
* @conn: connection to associate with callback * @conn: connection to associate with callback
* @state: domain event state * @state: object event state
* @callback: function to remove from event * @callback: function to remove from event
* *
* Unregister the function @callback with connection @conn, * Unregister the function @callback with connection @conn,
@ -1624,12 +1624,12 @@ cleanup:
*/ */
int int
virDomainEventStateDeregister(virConnectPtr conn, virDomainEventStateDeregister(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
virConnectDomainEventCallback callback) virConnectDomainEventCallback callback)
{ {
int ret; int ret;
virDomainEventStateLock(state); virObjectEventStateLock(state);
if (state->isDispatching) if (state->isDispatching)
ret = virDomainEventCallbackListMarkDelete(conn, ret = virDomainEventCallbackListMarkDelete(conn,
state->callbacks, callback); state->callbacks, callback);
@ -1643,15 +1643,15 @@ virDomainEventStateDeregister(virConnectPtr conn,
virObjectEventQueueClear(state->queue); virObjectEventQueueClear(state->queue);
} }
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
return ret; return ret;
} }
/** /**
* virDomainEventStateDeregisterID: * virObjectEventStateDeregisterID:
* @conn: connection to associate with callback * @conn: connection to associate with callback
* @state: domain event state * @state: object event state
* @callbackID: ID of the function to remove from event * @callbackID: ID of the function to remove from event
* *
* Unregister the function @callbackID with connection @conn, * Unregister the function @callbackID with connection @conn,
@ -1660,13 +1660,13 @@ virDomainEventStateDeregister(virConnectPtr conn,
* Returns: the number of callbacks still registered, or -1 on error * Returns: the number of callbacks still registered, or -1 on error
*/ */
int int
virDomainEventStateDeregisterID(virConnectPtr conn, virObjectEventStateDeregisterID(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
int callbackID) int callbackID)
{ {
int ret; int ret;
virDomainEventStateLock(state); virObjectEventStateLock(state);
if (state->isDispatching) if (state->isDispatching)
ret = virDomainEventCallbackListMarkDeleteID(conn, ret = virDomainEventCallbackListMarkDeleteID(conn,
state->callbacks, callbackID); state->callbacks, callbackID);
@ -1681,15 +1681,15 @@ virDomainEventStateDeregisterID(virConnectPtr conn,
virObjectEventQueueClear(state->queue); virObjectEventQueueClear(state->queue);
} }
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
return ret; return ret;
} }
/** /**
* virDomainEventStateEventID: * virObjectEventStateEventID:
* @conn: connection associated with the callback * @conn: connection associated with the callback
* @state: domain event state * @state: object event state
* @callbackID: the callback to query * @callbackID: the callback to query
* *
* Query what event ID type is associated with the * Query what event ID type is associated with the
@ -1698,15 +1698,15 @@ virDomainEventStateDeregisterID(virConnectPtr conn,
* Returns 0 on success, -1 on error * Returns 0 on success, -1 on error
*/ */
int int
virDomainEventStateEventID(virConnectPtr conn, virObjectEventStateEventID(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
int callbackID) int callbackID)
{ {
int ret; int ret;
virDomainEventStateLock(state); virObjectEventStateLock(state);
ret = virDomainEventCallbackListEventID(conn, ret = virDomainEventCallbackListEventID(conn,
state->callbacks, callbackID); state->callbacks, callbackID);
virDomainEventStateUnlock(state); virObjectEventStateUnlock(state);
return ret; return ret;
} }

26
src/conf/domain_event.h
View File

@ -41,8 +41,8 @@ typedef virDomainEventCallbackList *virDomainEventCallbackListPtr;
typedef struct _virDomainEvent virDomainEvent; typedef struct _virDomainEvent virDomainEvent;
typedef virDomainEvent *virDomainEventPtr; typedef virDomainEvent *virDomainEventPtr;
typedef struct _virDomainEventState virDomainEventState; typedef struct _virObjectEventState virObjectEventState;
typedef virDomainEventState *virDomainEventStatePtr; typedef virObjectEventState *virObjectEventStatePtr;
virDomainEventPtr virDomainEventNew(int id, const char *name, const unsigned char *uuid, int type, int detail); virDomainEventPtr virDomainEventNew(int id, const char *name, const unsigned char *uuid, int type, int detail);
virDomainEventPtr virDomainEventNewFromDom(virDomainPtr dom, int type, int detail); virDomainEventPtr virDomainEventNewFromDom(virDomainPtr dom, int type, int detail);
@ -136,22 +136,22 @@ virDomainEventPtr virDomainEventDeviceRemovedNewFromDom(virDomainPtr dom,
void virDomainEventFree(virDomainEventPtr event); void virDomainEventFree(virDomainEventPtr event);
void virDomainEventStateFree(virDomainEventStatePtr state); void virObjectEventStateFree(virObjectEventStatePtr state);
virDomainEventStatePtr virObjectEventStatePtr
virDomainEventStateNew(void); virObjectEventStateNew(void);
void void
virDomainEventStateQueue(virDomainEventStatePtr state, virObjectEventStateQueue(virObjectEventStatePtr state,
virDomainEventPtr event) virDomainEventPtr event)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int virDomainEventStateRegister(virConnectPtr conn, int virDomainEventStateRegister(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
virConnectDomainEventCallback callback, virConnectDomainEventCallback callback,
void *opaque, void *opaque,
virFreeCallback freecb) virFreeCallback freecb)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
int virDomainEventStateRegisterID(virConnectPtr conn, int virDomainEventStateRegisterID(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
virDomainPtr dom, virDomainPtr dom,
int eventID, int eventID,
virConnectDomainEventGenericCallback cb, virConnectDomainEventGenericCallback cb,
@ -161,17 +161,17 @@ int virDomainEventStateRegisterID(virConnectPtr conn,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
int int
virDomainEventStateDeregister(virConnectPtr conn, virDomainEventStateDeregister(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
virConnectDomainEventCallback callback) virConnectDomainEventCallback callback)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
int int
virDomainEventStateDeregisterID(virConnectPtr conn, virObjectEventStateDeregisterID(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
int callbackID) int callbackID)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int int
virDomainEventStateEventID(virConnectPtr conn, virObjectEventStateEventID(virConnectPtr conn,
virDomainEventStatePtr state, virObjectEventStatePtr state,
int callbackID) int callbackID)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

10
src/libvirt_private.syms
View File

@ -447,17 +447,17 @@ virDomainEventRebootNewFromObj;
virDomainEventRTCChangeNewFromDom; virDomainEventRTCChangeNewFromDom;
virDomainEventRTCChangeNewFromObj; virDomainEventRTCChangeNewFromObj;
virDomainEventStateDeregister; virDomainEventStateDeregister;
virDomainEventStateDeregisterID;
virDomainEventStateEventID;
virDomainEventStateFree;
virDomainEventStateNew;
virDomainEventStateQueue;
virDomainEventStateRegister; virDomainEventStateRegister;
virDomainEventStateRegisterID; virDomainEventStateRegisterID;
virDomainEventTrayChangeNewFromDom; virDomainEventTrayChangeNewFromDom;
virDomainEventTrayChangeNewFromObj; virDomainEventTrayChangeNewFromObj;
virDomainEventWatchdogNewFromDom; virDomainEventWatchdogNewFromDom;
virDomainEventWatchdogNewFromObj; virDomainEventWatchdogNewFromObj;
virObjectEventStateDeregisterID;
virObjectEventStateEventID;
virObjectEventStateFree;
virObjectEventStateNew;
virObjectEventStateQueue;
# conf/domain_nwfilter.h # conf/domain_nwfilter.h

2
src/libxl/libxl_conf.h
View File

@ -105,7 +105,7 @@ struct _libxlDriverPrivate {
virDomainXMLOptionPtr xmlopt; virDomainXMLOptionPtr xmlopt;
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
virDomainEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
virPortAllocatorPtr reservedVNCPorts; virPortAllocatorPtr reservedVNCPorts;

8
src/libxl/libxl_driver.c
View File

@ -102,7 +102,7 @@ libxlDomObjFromDomain(virDomainPtr dom)
static void static void
libxlDomainEventQueue(libxlDriverPrivatePtr driver, virDomainEventPtr event) libxlDomainEventQueue(libxlDriverPrivatePtr driver, virDomainEventPtr event)
{ {
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
static int static int
@ -778,7 +778,7 @@ libxlStateCleanup(void)
virObjectUnref(libxl_driver->domains); virObjectUnref(libxl_driver->domains);
virObjectUnref(libxl_driver->reservedVNCPorts); virObjectUnref(libxl_driver->reservedVNCPorts);
virDomainEventStateFree(libxl_driver->domainEventState); virObjectEventStateFree(libxl_driver->domainEventState);
virSysinfoDefFree(libxl_driver->hostsysinfo); virSysinfoDefFree(libxl_driver->hostsysinfo);
virMutexDestroy(&libxl_driver->lock); virMutexDestroy(&libxl_driver->lock);
@ -888,7 +888,7 @@ libxlStateInitialize(bool privileged,
/* read the host sysinfo */ /* read the host sysinfo */
libxl_driver->hostsysinfo = virSysinfoRead(); libxl_driver->hostsysinfo = virSysinfoRead();
libxl_driver->domainEventState = virDomainEventStateNew(); libxl_driver->domainEventState = virObjectEventStateNew();
if (!libxl_driver->domainEventState) if (!libxl_driver->domainEventState)
goto error; goto error;
@ -4145,7 +4145,7 @@ libxlConnectDomainEventDeregisterAny(virConnectPtr conn, int callbackID)
if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0)
return -1; return -1;
ret = virDomainEventStateDeregisterID(conn, ret = virObjectEventStateDeregisterID(conn,
driver->domainEventState, driver->domainEventState,
callbackID); callbackID);

2
src/lxc/lxc_conf.h
View File

@ -97,7 +97,7 @@ struct _virLXCDriver {
virUSBDeviceListPtr activeUsbHostdevs; virUSBDeviceListPtr activeUsbHostdevs;
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
virDomainEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
/* Immutable pointer. self-locking APIs */ /* Immutable pointer. self-locking APIs */
virSecurityManagerPtr securityManager; virSecurityManagerPtr securityManager;

22
src/lxc/lxc_driver.c
View File

@ -496,7 +496,7 @@ cleanup:
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return dom; return dom;
@ -547,7 +547,7 @@ cleanup:
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }
@ -944,7 +944,7 @@ cleanup:
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }
@ -1054,7 +1054,7 @@ cleanup:
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return dom; return dom;
@ -1245,7 +1245,7 @@ lxcConnectDomainEventDeregisterAny(virConnectPtr conn,
if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0)
return -1; return -1;
ret = virDomainEventStateDeregisterID(conn, ret = virObjectEventStateDeregisterID(conn,
driver->domainEventState, driver->domainEventState,
callbackID); callbackID);
@ -1302,7 +1302,7 @@ cleanup:
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return ret; return ret;
} }
@ -1398,7 +1398,7 @@ static int lxcStateInitialize(bool privileged,
if (!(lxc_driver->domains = virDomainObjListNew())) if (!(lxc_driver->domains = virDomainObjListNew()))
goto cleanup; goto cleanup;
lxc_driver->domainEventState = virDomainEventStateNew(); lxc_driver->domainEventState = virObjectEventStateNew();
if (!lxc_driver->domainEventState) if (!lxc_driver->domainEventState)
goto cleanup; goto cleanup;
@ -1486,7 +1486,7 @@ static void lxcNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
VIR_DOMAIN_EVENT_DEFINED_ADDED); VIR_DOMAIN_EVENT_DEFINED_ADDED);
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
} }
@ -1528,7 +1528,7 @@ static int lxcStateCleanup(void)
virNWFilterUnRegisterCallbackDriver(&lxcCallbackDriver); virNWFilterUnRegisterCallbackDriver(&lxcCallbackDriver);
virObjectUnref(lxc_driver->domains); virObjectUnref(lxc_driver->domains);
virDomainEventStateFree(lxc_driver->domainEventState); virObjectEventStateFree(lxc_driver->domainEventState);
virObjectUnref(lxc_driver->closeCallbacks); virObjectUnref(lxc_driver->closeCallbacks);
@ -2372,7 +2372,7 @@ static int lxcDomainSuspend(virDomainPtr dom)
cleanup: cleanup:
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
virObjectUnref(cfg); virObjectUnref(cfg);
@ -2422,7 +2422,7 @@ static int lxcDomainResume(virDomainPtr dom)
cleanup: cleanup:
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
virObjectUnref(cfg); virObjectUnref(cfg);

6
src/lxc/lxc_process.c
View File

@ -82,7 +82,7 @@ lxcProcessAutoDestroy(virDomainObjPtr dom,
} }
if (event) if (event)
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return dom; return dom;
} }
@ -533,7 +533,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon,
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
if (event) { if (event) {
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
} }
@ -1399,7 +1399,7 @@ virLXCProcessAutostartDomain(virDomainObjPtr vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
if (event) if (event)
virDomainEventStateQueue(data->driver->domainEventState, event); virObjectEventStateQueue(data->driver->domainEventState, event);
} }
} }
virObjectUnlock(vm); virObjectUnlock(vm);

2
src/parallels/parallels_utils.h
View File

@ -44,7 +44,7 @@ struct _parallelsConn {
virNetworkObjList networks; virNetworkObjList networks;
virCapsPtr caps; virCapsPtr caps;
virDomainXMLOptionPtr xmlopt; virDomainXMLOptionPtr xmlopt;
virDomainEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
}; };
typedef struct _parallelsConn parallelsConn; typedef struct _parallelsConn parallelsConn;

2
src/qemu/qemu_conf.h
View File

@ -208,7 +208,7 @@ struct _virQEMUDriver {
virQEMUCapsCachePtr qemuCapsCache; virQEMUCapsCachePtr qemuCapsCache;
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
virDomainEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
/* Immutable pointer. self-locking APIs */ /* Immutable pointer. self-locking APIs */
virSecurityManagerPtr securityManager; virSecurityManagerPtr securityManager;

2
src/qemu/qemu_domain.c
View File

@ -120,7 +120,7 @@ qemuDomainAsyncJobPhaseFromString(enum qemuDomainAsyncJob job,
void qemuDomainEventQueue(virQEMUDriverPtr driver, void qemuDomainEventQueue(virQEMUDriverPtr driver,
virDomainEventPtr event) virDomainEventPtr event)
{ {
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }

6
src/qemu/qemu_driver.c
View File

@ -597,7 +597,7 @@ qemuStateInitialize(bool privileged,
goto error; goto error;
/* Init domain events */ /* Init domain events */
qemu_driver->domainEventState = virDomainEventStateNew(); qemu_driver->domainEventState = virObjectEventStateNew();
if (!qemu_driver->domainEventState) if (!qemu_driver->domainEventState)
goto error; goto error;
@ -1015,7 +1015,7 @@ qemuStateCleanup(void) {
ebtablesContextFree(qemu_driver->ebtables); ebtablesContextFree(qemu_driver->ebtables);
/* Free domain callback list */ /* Free domain callback list */
virDomainEventStateFree(qemu_driver->domainEventState); virObjectEventStateFree(qemu_driver->domainEventState);
virLockManagerPluginUnref(qemu_driver->lockManager); virLockManagerPluginUnref(qemu_driver->lockManager);
@ -10016,7 +10016,7 @@ qemuConnectDomainEventDeregisterAny(virConnectPtr conn,
if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0)
goto cleanup; goto cleanup;
if (virDomainEventStateDeregisterID(conn, if (virObjectEventStateDeregisterID(conn,
driver->domainEventState, driver->domainEventState,
callbackID) < 0) callbackID) < 0)
goto cleanup; goto cleanup;

14
src/remote/remote_driver.c
View File

@ -92,7 +92,7 @@ struct private_data {
char *hostname; /* Original hostname */ char *hostname; /* Original hostname */
bool serverKeepAlive; /* Does server support keepalive protocol? */ bool serverKeepAlive; /* Does server support keepalive protocol? */
virDomainEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
}; };
enum { enum {
@ -880,7 +880,7 @@ doRemoteOpen(virConnectPtr conn,
goto failed; goto failed;
} }
if (!(priv->domainEventState = virDomainEventStateNew())) if (!(priv->domainEventState = virObjectEventStateNew()))
goto failed; goto failed;
/* Successful. */ /* Successful. */
@ -1085,7 +1085,7 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv)
/* See comment for remoteType. */ /* See comment for remoteType. */
VIR_FREE(priv->type); VIR_FREE(priv->type);
virDomainEventStateFree(priv->domainEventState); virObjectEventStateFree(priv->domainEventState);
priv->domainEventState = NULL; priv->domainEventState = NULL;
return ret; return ret;
@ -5122,7 +5122,7 @@ static int remoteConnectDomainEventRegisterAny(virConnectPtr conn,
if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY, if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY,
(xdrproc_t) xdr_remote_connect_domain_event_register_any_args, (char *) &args, (xdrproc_t) xdr_remote_connect_domain_event_register_any_args, (char *) &args,
(xdrproc_t) xdr_void, (char *)NULL) == -1) { (xdrproc_t) xdr_void, (char *)NULL) == -1) {
virDomainEventStateDeregisterID(conn, virObjectEventStateDeregisterID(conn,
priv->domainEventState, priv->domainEventState,
callbackID); callbackID);
goto done; goto done;
@ -5148,14 +5148,14 @@ static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn,
remoteDriverLock(priv); remoteDriverLock(priv);
if ((eventID = virDomainEventStateEventID(conn, if ((eventID = virObjectEventStateEventID(conn,
priv->domainEventState, priv->domainEventState,
callbackID)) < 0) { callbackID)) < 0) {
virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID);
goto done; goto done;
} }
if ((count = virDomainEventStateDeregisterID(conn, if ((count = virObjectEventStateDeregisterID(conn,
priv->domainEventState, priv->domainEventState,
callbackID)) < 0) { callbackID)) < 0) {
virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID); virReportError(VIR_ERR_RPC, _("unable to find callback ID %d"), callbackID);
@ -6692,7 +6692,7 @@ done:
static void static void
remoteDomainEventQueue(struct private_data *priv, virDomainEventPtr event) remoteDomainEventQueue(struct private_data *priv, virDomainEventPtr event)
{ {
virDomainEventStateQueue(priv->domainEventState, event); virObjectEventStateQueue(priv->domainEventState, event);
} }
/* get_nonnull_domain and get_nonnull_network turn an on-wire /* get_nonnull_domain and get_nonnull_network turn an on-wire

10
src/test/test_driver.c
View File

@ -99,7 +99,7 @@ struct _testConn {
int numCells; int numCells;
testCell cells[MAX_CELLS]; testCell cells[MAX_CELLS];
virDomainEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
}; };
typedef struct _testConn testConn; typedef struct _testConn testConn;
typedef struct _testConn *testConnPtr; typedef struct _testConn *testConnPtr;
@ -1444,7 +1444,7 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn,
privconn = conn->privateData; privconn = conn->privateData;
testDriverLock(privconn); testDriverLock(privconn);
privconn->domainEventState = virDomainEventStateNew(); privconn->domainEventState = virObjectEventStateNew();
if (!privconn->domainEventState) { if (!privconn->domainEventState) {
testDriverUnlock(privconn); testDriverUnlock(privconn);
testConnectClose(conn); testConnectClose(conn);
@ -1467,7 +1467,7 @@ static int testConnectClose(virConnectPtr conn)
virNetworkObjListFree(&privconn->networks); virNetworkObjListFree(&privconn->networks);
virInterfaceObjListFree(&privconn->ifaces); virInterfaceObjListFree(&privconn->ifaces);
virStoragePoolObjListFree(&privconn->pools); virStoragePoolObjListFree(&privconn->pools);
virDomainEventStateFree(privconn->domainEventState); virObjectEventStateFree(privconn->domainEventState);
VIR_FREE(privconn->path); VIR_FREE(privconn->path);
testDriverUnlock(privconn); testDriverUnlock(privconn);
@ -6018,7 +6018,7 @@ testConnectDomainEventDeregisterAny(virConnectPtr conn,
int ret; int ret;
testDriverLock(driver); testDriverLock(driver);
ret = virDomainEventStateDeregisterID(conn, ret = virObjectEventStateDeregisterID(conn,
driver->domainEventState, driver->domainEventState,
callbackID); callbackID);
testDriverUnlock(driver); testDriverUnlock(driver);
@ -6031,7 +6031,7 @@ testConnectDomainEventDeregisterAny(virConnectPtr conn,
static void testDomainEventQueue(testConnPtr driver, static void testDomainEventQueue(testConnPtr driver,
virDomainEventPtr event) virDomainEventPtr event)
{ {
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
static virDrvOpenStatus testSecretOpen(virConnectPtr conn, static virDrvOpenStatus testSecretOpen(virConnectPtr conn,

2
src/uml/uml_conf.h
View File

@ -66,7 +66,7 @@ struct uml_driver {
virDomainXMLOptionPtr xmlopt; virDomainXMLOptionPtr xmlopt;
/* Event handling */ /* Event handling */
virDomainEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
/* Mapping of 'char *uuidstr' -> virConnectPtr /* Mapping of 'char *uuidstr' -> virConnectPtr
* of guests which will be automatically killed * of guests which will be automatically killed

8
src/uml/uml_driver.c
View File

@ -475,7 +475,7 @@ umlStateInitialize(bool privileged,
if (!(uml_driver->domains = virDomainObjListNew())) if (!(uml_driver->domains = virDomainObjListNew()))
goto error; goto error;
uml_driver->domainEventState = virDomainEventStateNew(); uml_driver->domainEventState = virObjectEventStateNew();
if (!uml_driver->domainEventState) if (!uml_driver->domainEventState)
goto error; goto error;
@ -677,7 +677,7 @@ umlStateCleanup(void) {
virObjectUnref(uml_driver->domains); virObjectUnref(uml_driver->domains);
virDomainEventStateFree(uml_driver->domainEventState); virObjectEventStateFree(uml_driver->domainEventState);
VIR_FREE(uml_driver->logDir); VIR_FREE(uml_driver->logDir);
VIR_FREE(uml_driver->configDir); VIR_FREE(uml_driver->configDir);
@ -2680,7 +2680,7 @@ umlConnectDomainEventDeregisterAny(virConnectPtr conn,
return -1; return -1;
umlDriverLock(driver); umlDriverLock(driver);
ret = virDomainEventStateDeregisterID(conn, ret = virObjectEventStateDeregisterID(conn,
driver->domainEventState, driver->domainEventState,
callbackID); callbackID);
umlDriverUnlock(driver); umlDriverUnlock(driver);
@ -2693,7 +2693,7 @@ umlConnectDomainEventDeregisterAny(virConnectPtr conn,
static void umlDomainEventQueue(struct uml_driver *driver, static void umlDomainEventQueue(struct uml_driver *driver,
virDomainEventPtr event) virDomainEventPtr event)
{ {
virDomainEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
static int umlConnectListAllDomains(virConnectPtr conn, static int umlConnectListAllDomains(virConnectPtr conn,

14
src/vbox/vbox_tmpl.c
View File

@ -213,7 +213,7 @@ typedef struct {
#else /* !(VBOX_API_VERSION == 2002) */ #else /* !(VBOX_API_VERSION == 2002) */
/* Async event handling */ /* Async event handling */
virDomainEventStatePtr domainEvents; virObjectEventStatePtr domainEvents;
int fdWatch; int fdWatch;
# if VBOX_API_VERSION <= 3002 # if VBOX_API_VERSION <= 3002
@ -990,7 +990,7 @@ static void vboxUninitialize(vboxGlobalData *data) {
#if VBOX_API_VERSION == 2002 #if VBOX_API_VERSION == 2002
/* No domainEventCallbacks in 2.2.* version */ /* No domainEventCallbacks in 2.2.* version */
#else /* !(VBOX_API_VERSION == 2002) */ #else /* !(VBOX_API_VERSION == 2002) */
virDomainEventStateFree(data->domainEvents); virObjectEventStateFree(data->domainEvents);
#endif /* !(VBOX_API_VERSION == 2002) */ #endif /* !(VBOX_API_VERSION == 2002) */
VIR_FREE(data); VIR_FREE(data);
} }
@ -1055,7 +1055,7 @@ static virDrvOpenStatus vboxConnectOpen(virConnectPtr conn,
#else /* !(VBOX_API_VERSION == 2002) */ #else /* !(VBOX_API_VERSION == 2002) */
if (!(data->domainEvents = virDomainEventStateNew())) { if (!(data->domainEvents = virObjectEventStateNew())) {
vboxUninitialize(data); vboxUninitialize(data);
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
@ -6999,7 +6999,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
ev = virDomainEventNewFromDom(dom, event, detail); ev = virDomainEventNewFromDom(dom, event, detail);
if (ev) if (ev)
virDomainEventStateQueue(g_pVBoxGlobalData->domainEvents, ev); virObjectEventStateQueue(g_pVBoxGlobalData->domainEvents, ev);
} }
} }
@ -7103,7 +7103,7 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
ev = virDomainEventNewFromDom(dom, event, detail); ev = virDomainEventNewFromDom(dom, event, detail);
if (ev) if (ev)
virDomainEventStateQueue(g_pVBoxGlobalData->domainEvents, ev); virObjectEventStateQueue(g_pVBoxGlobalData->domainEvents, ev);
} }
} }
@ -7328,7 +7328,7 @@ static int vboxConnectDomainEventRegister(virConnectPtr conn,
ret = virDomainEventStateRegister(conn, data->domainEvents, ret = virDomainEventStateRegister(conn, data->domainEvents,
callback, opaque, freecb); callback, opaque, freecb);
VIR_DEBUG("virDomainEventStateRegister (ret = %d) (conn: %p, " VIR_DEBUG("virObjectEventStateRegister (ret = %d) (conn: %p, "
"callback: %p, opaque: %p, " "callback: %p, opaque: %p, "
"freecb: %p)", ret, conn, callback, "freecb: %p)", ret, conn, callback,
opaque, freecb); opaque, freecb);
@ -7451,7 +7451,7 @@ static int vboxConnectDomainEventDeregisterAny(virConnectPtr conn,
*/ */
vboxDriverLock(data); vboxDriverLock(data);
cnt = virDomainEventStateDeregisterID(conn, data->domainEvents, cnt = virObjectEventStateDeregisterID(conn, data->domainEvents,
callbackID); callbackID);
if (data->vboxCallback && cnt == 0) { if (data->vboxCallback && cnt == 0) {

8
src/xen/xen_driver.c
View File

@ -453,7 +453,7 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
if (!(priv->domainEvents = virDomainEventStateNew())) { if (!(priv->domainEvents = virObjectEventStateNew())) {
virMutexDestroy(&priv->lock); virMutexDestroy(&priv->lock);
VIR_FREE(priv); VIR_FREE(priv);
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
@ -551,7 +551,7 @@ xenUnifiedConnectClose(virConnectPtr conn)
virObjectUnref(priv->caps); virObjectUnref(priv->caps);
virObjectUnref(priv->xmlopt); virObjectUnref(priv->xmlopt);
virDomainEventStateFree(priv->domainEvents); virObjectEventStateFree(priv->domainEvents);
#if WITH_XEN_INOTIFY #if WITH_XEN_INOTIFY
if (priv->opened[XEN_UNIFIED_INOTIFY_OFFSET]) if (priv->opened[XEN_UNIFIED_INOTIFY_OFFSET])
@ -2409,7 +2409,7 @@ xenUnifiedConnectDomainEventDeregisterAny(virConnectPtr conn,
return -1; return -1;
} }
ret = virDomainEventStateDeregisterID(conn, ret = virObjectEventStateDeregisterID(conn,
priv->domainEvents, priv->domainEvents,
callbackID); callbackID);
@ -2951,7 +2951,7 @@ void xenUnifiedDomainEventDispatch(xenUnifiedPrivatePtr priv,
if (!priv) if (!priv)
return; return;
virDomainEventStateQueue(priv->domainEvents, event); virObjectEventStateQueue(priv->domainEvents, event);
} }
void xenUnifiedLock(xenUnifiedPrivatePtr priv) void xenUnifiedLock(xenUnifiedPrivatePtr priv)

2
src/xen/xen_driver.h
View File

@ -159,7 +159,7 @@ struct _xenUnifiedPrivate {
int nbNodeCells; int nbNodeCells;
int nbNodeCpus; int nbNodeCpus;
virDomainEventStatePtr domainEvents; virObjectEventStatePtr domainEvents;
/* Location of config files, either /etc /* Location of config files, either /etc
* or /var/lib/xen */ * or /var/lib/xen */

2
tests/qemuhotplugtest.c
View File

@ -344,7 +344,7 @@ mymain(void)
if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
if (!(driver.domainEventState = virDomainEventStateNew())) if (!(driver.domainEventState = virObjectEventStateNew()))
return EXIT_FAILURE; return EXIT_FAILURE;
driver.lockManager = virLockManagerPluginNew("nop", "qemu", driver.lockManager = virLockManagerPluginNew("nop", "qemu",