mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
Remove decl of all APIs related to domain event callbacks & queues
The virDomainEventCallbackList and virDomainEventQueue APIs are now solely helpers used internally by virDomainEventState APIs. Remove their decls from domain_event.h since no driver code should need to use them any more. * src/conf/domain_event.c: Make virDomainEventCallbackList and virDomainEventQueue APIs static & remove some unused APIs * src/conf/domain_event.h, src/libvirt_private.syms: Remove virDomainEventCallbackList and virDomainEventQueue APIs
This commit is contained in:
parent
06eb22df01
commit
2c2d533768
@ -126,7 +126,7 @@ struct _virDomainEvent {
|
|||||||
*
|
*
|
||||||
* Free the memory in the domain event callback list
|
* Free the memory in the domain event callback list
|
||||||
*/
|
*/
|
||||||
void
|
static void
|
||||||
virDomainEventCallbackListFree(virDomainEventCallbackListPtr list)
|
virDomainEventCallbackListFree(virDomainEventCallbackListPtr list)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -151,7 +151,7 @@ virDomainEventCallbackListFree(virDomainEventCallbackListPtr list)
|
|||||||
*
|
*
|
||||||
* Internal function to remove a callback from a virDomainEventCallbackListPtr
|
* Internal function to remove a callback from a virDomainEventCallbackListPtr
|
||||||
*/
|
*/
|
||||||
int
|
static int
|
||||||
virDomainEventCallbackListRemove(virConnectPtr conn,
|
virDomainEventCallbackListRemove(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList,
|
virDomainEventCallbackListPtr cbList,
|
||||||
virConnectDomainEventCallback callback)
|
virConnectDomainEventCallback callback)
|
||||||
@ -202,7 +202,7 @@ virDomainEventCallbackListRemove(virConnectPtr conn,
|
|||||||
*
|
*
|
||||||
* Internal function to remove a callback from a virDomainEventCallbackListPtr
|
* Internal function to remove a callback from a virDomainEventCallbackListPtr
|
||||||
*/
|
*/
|
||||||
int
|
static int
|
||||||
virDomainEventCallbackListRemoveID(virConnectPtr conn,
|
virDomainEventCallbackListRemoveID(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList,
|
virDomainEventCallbackListPtr cbList,
|
||||||
int callbackID)
|
int callbackID)
|
||||||
@ -252,7 +252,7 @@ virDomainEventCallbackListRemoveID(virConnectPtr conn,
|
|||||||
* Internal function to remove all of a given connection's callback
|
* Internal function to remove all of a given connection's callback
|
||||||
* from a virDomainEventCallbackListPtr
|
* from a virDomainEventCallbackListPtr
|
||||||
*/
|
*/
|
||||||
int
|
static int
|
||||||
virDomainEventCallbackListRemoveConn(virConnectPtr conn,
|
virDomainEventCallbackListRemoveConn(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList)
|
virDomainEventCallbackListPtr cbList)
|
||||||
{
|
{
|
||||||
@ -283,7 +283,8 @@ virDomainEventCallbackListRemoveConn(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListMarkDelete(virConnectPtr conn,
|
static int
|
||||||
|
virDomainEventCallbackListMarkDelete(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList,
|
virDomainEventCallbackListPtr cbList,
|
||||||
virConnectDomainEventCallback callback)
|
virConnectDomainEventCallback callback)
|
||||||
{
|
{
|
||||||
@ -308,7 +309,8 @@ int virDomainEventCallbackListMarkDelete(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListMarkDeleteID(virConnectPtr conn,
|
static int
|
||||||
|
virDomainEventCallbackListMarkDeleteID(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList,
|
virDomainEventCallbackListPtr cbList,
|
||||||
int callbackID)
|
int callbackID)
|
||||||
{
|
{
|
||||||
@ -332,7 +334,8 @@ int virDomainEventCallbackListMarkDeleteID(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList)
|
static int
|
||||||
|
virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList)
|
||||||
{
|
{
|
||||||
int old_count = cbList->count;
|
int old_count = cbList->count;
|
||||||
int i;
|
int i;
|
||||||
@ -361,29 +364,6 @@ int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* virDomainEventCallbackListAdd:
|
|
||||||
* @conn: pointer to the connection
|
|
||||||
* @cbList: the list
|
|
||||||
* @callback: the callback to add
|
|
||||||
* @opaque: opaque data tio pass to callback
|
|
||||||
*
|
|
||||||
* Internal function to add a callback from a virDomainEventCallbackListPtr
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
virDomainEventCallbackListAdd(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
virConnectDomainEventCallback callback,
|
|
||||||
void *opaque,
|
|
||||||
virFreeCallback freecb)
|
|
||||||
{
|
|
||||||
return virDomainEventCallbackListAddID(conn, cbList, NULL,
|
|
||||||
VIR_DOMAIN_EVENT_ID_LIFECYCLE,
|
|
||||||
VIR_DOMAIN_EVENT_CALLBACK(callback),
|
|
||||||
opaque, freecb, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* virDomainEventCallbackListAddID:
|
* virDomainEventCallbackListAddID:
|
||||||
* @conn: pointer to the connection
|
* @conn: pointer to the connection
|
||||||
@ -395,7 +375,7 @@ virDomainEventCallbackListAdd(virConnectPtr conn,
|
|||||||
*
|
*
|
||||||
* Internal function to add a callback from a virDomainEventCallbackListPtr
|
* Internal function to add a callback from a virDomainEventCallbackListPtr
|
||||||
*/
|
*/
|
||||||
int
|
static int
|
||||||
virDomainEventCallbackListAddID(virConnectPtr conn,
|
virDomainEventCallbackListAddID(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList,
|
virDomainEventCallbackListPtr cbList,
|
||||||
virDomainPtr dom,
|
virDomainPtr dom,
|
||||||
@ -478,27 +458,32 @@ no_memory:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListCountID(virConnectPtr conn,
|
/**
|
||||||
|
* virDomainEventCallbackListAdd:
|
||||||
|
* @conn: pointer to the connection
|
||||||
|
* @cbList: the list
|
||||||
|
* @callback: the callback to add
|
||||||
|
* @opaque: opaque data tio pass to callback
|
||||||
|
*
|
||||||
|
* Internal function to add a callback from a virDomainEventCallbackListPtr
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
virDomainEventCallbackListAdd(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList,
|
virDomainEventCallbackListPtr cbList,
|
||||||
int eventID)
|
virConnectDomainEventCallback callback,
|
||||||
|
void *opaque,
|
||||||
|
virFreeCallback freecb)
|
||||||
{
|
{
|
||||||
int i;
|
return virDomainEventCallbackListAddID(conn, cbList, NULL,
|
||||||
int count = 0;
|
VIR_DOMAIN_EVENT_ID_LIFECYCLE,
|
||||||
|
VIR_DOMAIN_EVENT_CALLBACK(callback),
|
||||||
for (i = 0 ; i < cbList->count ; i++) {
|
opaque, freecb, NULL);
|
||||||
if (cbList->callbacks[i]->deleted)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (cbList->callbacks[i]->eventID == eventID &&
|
|
||||||
cbList->callbacks[i]->conn == conn)
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListEventID(virConnectPtr conn,
|
|
||||||
|
static int
|
||||||
|
virDomainEventCallbackListEventID(virConnectPtr conn,
|
||||||
virDomainEventCallbackListPtr cbList,
|
virDomainEventCallbackListPtr cbList,
|
||||||
int callbackID)
|
int callbackID)
|
||||||
{
|
{
|
||||||
@ -517,22 +502,6 @@ int virDomainEventCallbackListEventID(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListCount(virDomainEventCallbackListPtr cbList)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
int count = 0;
|
|
||||||
|
|
||||||
for (i = 0 ; i < cbList->count ; i++) {
|
|
||||||
if (cbList->callbacks[i]->deleted)
|
|
||||||
continue;
|
|
||||||
if (cbList->callbacks[i]->eventID == VIR_DOMAIN_EVENT_ID_LIFECYCLE)
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void virDomainEventFree(virDomainEventPtr event)
|
void virDomainEventFree(virDomainEventPtr event)
|
||||||
{
|
{
|
||||||
if (!event)
|
if (!event)
|
||||||
@ -589,7 +558,7 @@ void virDomainEventFree(virDomainEventPtr event)
|
|||||||
*
|
*
|
||||||
* Free the memory in the queue. We process this like a list here
|
* Free the memory in the queue. We process this like a list here
|
||||||
*/
|
*/
|
||||||
void
|
static void
|
||||||
virDomainEventQueueFree(virDomainEventQueuePtr queue)
|
virDomainEventQueueFree(virDomainEventQueuePtr queue)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -603,7 +572,8 @@ virDomainEventQueueFree(virDomainEventQueuePtr queue)
|
|||||||
VIR_FREE(queue);
|
VIR_FREE(queue);
|
||||||
}
|
}
|
||||||
|
|
||||||
virDomainEventQueuePtr virDomainEventQueueNew(void)
|
static virDomainEventQueuePtr
|
||||||
|
virDomainEventQueueNew(void)
|
||||||
{
|
{
|
||||||
virDomainEventQueuePtr ret;
|
virDomainEventQueuePtr ret;
|
||||||
|
|
||||||
@ -1085,41 +1055,6 @@ virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom,
|
|||||||
devAlias, reason);
|
devAlias, reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* virDomainEventQueuePop:
|
|
||||||
* @evtQueue: the queue of events
|
|
||||||
*
|
|
||||||
* Internal function to pop off, and return the front of the queue
|
|
||||||
* NOTE: The caller is responsible for freeing the returned object
|
|
||||||
*
|
|
||||||
* Returns: virDomainEventPtr on success NULL on failure.
|
|
||||||
*/
|
|
||||||
virDomainEventPtr
|
|
||||||
virDomainEventQueuePop(virDomainEventQueuePtr evtQueue)
|
|
||||||
{
|
|
||||||
virDomainEventPtr ret;
|
|
||||||
|
|
||||||
if (!evtQueue || evtQueue->count == 0 ) {
|
|
||||||
eventReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
||||||
_("event queue is empty, nothing to pop"));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = evtQueue->events[0];
|
|
||||||
|
|
||||||
memmove(evtQueue->events,
|
|
||||||
evtQueue->events + 1,
|
|
||||||
sizeof(*(evtQueue->events)) *
|
|
||||||
(evtQueue->count - 1));
|
|
||||||
|
|
||||||
if (VIR_REALLOC_N(evtQueue->events,
|
|
||||||
evtQueue->count - 1) < 0) {
|
|
||||||
; /* Failure to reduce memory allocation isn't fatal */
|
|
||||||
}
|
|
||||||
evtQueue->count--;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* virDomainEventQueuePush:
|
* virDomainEventQueuePush:
|
||||||
@ -1130,7 +1065,7 @@ virDomainEventQueuePop(virDomainEventQueuePtr evtQueue)
|
|||||||
*
|
*
|
||||||
* Returns: 0 on success, -1 on failure
|
* Returns: 0 on success, -1 on failure
|
||||||
*/
|
*/
|
||||||
int
|
static int
|
||||||
virDomainEventQueuePush(virDomainEventQueuePtr evtQueue,
|
virDomainEventQueuePush(virDomainEventQueuePtr evtQueue,
|
||||||
virDomainEventPtr event)
|
virDomainEventPtr event)
|
||||||
{
|
{
|
||||||
|
@ -46,62 +46,6 @@ typedef virDomainEventQueue *virDomainEventQueuePtr;
|
|||||||
typedef struct _virDomainEventState virDomainEventState;
|
typedef struct _virDomainEventState virDomainEventState;
|
||||||
typedef virDomainEventState *virDomainEventStatePtr;
|
typedef virDomainEventState *virDomainEventStatePtr;
|
||||||
|
|
||||||
void virDomainEventCallbackListFree(virDomainEventCallbackListPtr list);
|
|
||||||
|
|
||||||
int virDomainEventCallbackListAdd(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
virConnectDomainEventCallback callback,
|
|
||||||
void *opaque,
|
|
||||||
virFreeCallback freecb)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
int virDomainEventCallbackListAddID(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
virDomainPtr dom,
|
|
||||||
int eventID,
|
|
||||||
virConnectDomainEventGenericCallback cb,
|
|
||||||
void *opaque,
|
|
||||||
virFreeCallback freecb,
|
|
||||||
int *callbackID)
|
|
||||||
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(5);
|
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListRemove(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
virConnectDomainEventCallback callback)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
int virDomainEventCallbackListRemoveID(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
int callbackID)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
int virDomainEventCallbackListRemoveConn(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListMarkDelete(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
virConnectDomainEventCallback callback)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
int virDomainEventCallbackListMarkDeleteID(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
int callbackID)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
|
|
||||||
|
|
||||||
int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList);
|
|
||||||
|
|
||||||
int virDomainEventCallbackListCount(virDomainEventCallbackListPtr cbList);
|
|
||||||
int virDomainEventCallbackListCountID(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
int eventID)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
int virDomainEventCallbackListEventID(virConnectPtr conn,
|
|
||||||
virDomainEventCallbackListPtr cbList,
|
|
||||||
int callbackID)
|
|
||||||
ATTRIBUTE_NONNULL(1);
|
|
||||||
|
|
||||||
virDomainEventQueuePtr virDomainEventQueueNew(void);
|
|
||||||
|
|
||||||
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);
|
||||||
virDomainEventPtr virDomainEventNewFromObj(virDomainObjPtr obj, int type, int detail);
|
virDomainEventPtr virDomainEventNewFromObj(virDomainObjPtr obj, int type, int detail);
|
||||||
@ -171,14 +115,8 @@ virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom,
|
|||||||
const char *devAlias,
|
const char *devAlias,
|
||||||
int reason);
|
int reason);
|
||||||
|
|
||||||
int virDomainEventQueuePush(virDomainEventQueuePtr evtQueue,
|
|
||||||
virDomainEventPtr event);
|
|
||||||
|
|
||||||
virDomainEventPtr
|
|
||||||
virDomainEventQueuePop(virDomainEventQueuePtr evtQueue);
|
|
||||||
|
|
||||||
void virDomainEventFree(virDomainEventPtr event);
|
void virDomainEventFree(virDomainEventPtr event);
|
||||||
void virDomainEventQueueFree(virDomainEventQueuePtr queue);
|
|
||||||
void virDomainEventStateFree(virDomainEventStatePtr state);
|
void virDomainEventStateFree(virDomainEventStatePtr state);
|
||||||
virDomainEventStatePtr
|
virDomainEventStatePtr
|
||||||
virDomainEventStateNew(virEventTimeoutCallback timeout_cb,
|
virDomainEventStateNew(virEventTimeoutCallback timeout_cb,
|
||||||
|
@ -471,18 +471,6 @@ virDomainWatchdogModelTypeToString;
|
|||||||
# domain_event.h
|
# domain_event.h
|
||||||
virDomainEventBlockJobNewFromObj;
|
virDomainEventBlockJobNewFromObj;
|
||||||
virDomainEventBlockJobNewFromDom;
|
virDomainEventBlockJobNewFromDom;
|
||||||
virDomainEventCallbackListAdd;
|
|
||||||
virDomainEventCallbackListAddID;
|
|
||||||
virDomainEventCallbackListCount;
|
|
||||||
virDomainEventCallbackListCountID;
|
|
||||||
virDomainEventCallbackListEventID;
|
|
||||||
virDomainEventCallbackListFree;
|
|
||||||
virDomainEventCallbackListMarkDelete;
|
|
||||||
virDomainEventCallbackListMarkDeleteID;
|
|
||||||
virDomainEventCallbackListPurgeMarked;
|
|
||||||
virDomainEventCallbackListRemove;
|
|
||||||
virDomainEventCallbackListRemoveConn;
|
|
||||||
virDomainEventCallbackListRemoveID;
|
|
||||||
virDomainEventControlErrorNewFromDom;
|
virDomainEventControlErrorNewFromDom;
|
||||||
virDomainEventControlErrorNewFromObj;
|
virDomainEventControlErrorNewFromObj;
|
||||||
virDomainEventDiskChangeNewFromDom;
|
virDomainEventDiskChangeNewFromDom;
|
||||||
@ -500,11 +488,6 @@ virDomainEventNew;
|
|||||||
virDomainEventNewFromDef;
|
virDomainEventNewFromDef;
|
||||||
virDomainEventNewFromDom;
|
virDomainEventNewFromDom;
|
||||||
virDomainEventNewFromObj;
|
virDomainEventNewFromObj;
|
||||||
virDomainEventQueueDispatch;
|
|
||||||
virDomainEventQueueFree;
|
|
||||||
virDomainEventQueueNew;
|
|
||||||
virDomainEventQueuePop;
|
|
||||||
virDomainEventQueuePush;
|
|
||||||
virDomainEventRTCChangeNewFromDom;
|
virDomainEventRTCChangeNewFromDom;
|
||||||
virDomainEventRTCChangeNewFromObj;
|
virDomainEventRTCChangeNewFromObj;
|
||||||
virDomainEventRebootNew;
|
virDomainEventRebootNew;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user