From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; While the public API & wire protocol included the 'detail' arg for network lifecycle events, the internal event handling code did not process it. This meant that if a future libvirtd server starts sending non-0 'detail' args, the current libvirt client will not process them. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/conf/network_event.c | 7 +++++-- src/conf/network_event.h | 3 ++- src/network/bridge_driver.c | 15 ++++++++++----- src/remote/remote_driver.c | 2 +- src/test/test_driver.c | 15 ++++++++++----- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/conf/network_event.c b/src/conf/network_event.c index 4a02523..b885ced 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -32,6 +32,7 @@ struct _virNetworkEventLifecycle { virObjectEvent parent; int type; + int detail; }; typedef struct _virNetworkEventLifecycle virNetworkEventLifecycle; typedef virNetworkEventLifecycle *virNetworkEventLifecyclePtr; @@ -80,7 +81,7 @@ virNetworkEventDispatchDefaultFunc(virConnectPtr conn, networkLifecycleEvent = (virNetworkEventLifecyclePtr)event; ((virConnectNetworkEventLifecycleCallback)cb)(conn, net, networkLifecycleEvent->type, - 0, + networkLifecycleEvent->detail, cbopaque); goto cleanup; } @@ -135,7 +136,8 @@ virNetworkEventStateRegisterID(virConnectPtr conn, virObjectEventPtr virNetworkEventLifecycleNew(const char *name, const unsigned char *uuid, - int type) + int type, + int detail) { virNetworkEventLifecyclePtr event; int eventId = (VIR_EVENT_NAMESPACE_NETWORK << 8) + VIR_NETWORK_EVENT_ID_LIFECYCLE; @@ -149,6 +151,7 @@ virNetworkEventLifecycleNew(const char *name, return NULL; event->type = type; + event->detail = detail; return (virObjectEventPtr)event; } diff --git a/src/conf/network_event.h b/src/conf/network_event.h index 44b762e..1eef771 100644 --- a/src/conf/network_event.h +++ b/src/conf/network_event.h @@ -40,7 +40,8 @@ virNetworkEventStateRegisterID(virConnectPtr conn, virObjectEventPtr virNetworkEventLifecycleNew(const char *name, const unsigned char *uuid, - int type); + int type, + int detail); void virNetworkEventDispatchDefaultFunc(virConnectPtr conn, diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1bde7d7..3e10758 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2559,7 +2559,8 @@ static virNetworkPtr networkCreateXML(virConnectPtr conn, const char *xml) { event = virNetworkEventLifecycleNew(network->def->name, network->def->uuid, - VIR_NETWORK_EVENT_STARTED); + VIR_NETWORK_EVENT_STARTED, + 0); VIR_INFO("Creating network '%s'", network->def->name); ret = virGetNetwork(conn, network->def->name, network->def->uuid); @@ -2621,7 +2622,8 @@ static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml) { } event = virNetworkEventLifecycleNew(def->name, def->uuid, - VIR_NETWORK_EVENT_DEFINED); + VIR_NETWORK_EVENT_DEFINED, + 0); VIR_INFO("Defining network '%s'", def->name); ret = virGetNetwork(conn, def->name, def->uuid); @@ -2673,7 +2675,8 @@ networkUndefine(virNetworkPtr net) { event = virNetworkEventLifecycleNew(network->def->name, network->def->uuid, - VIR_NETWORK_EVENT_UNDEFINED); + VIR_NETWORK_EVENT_UNDEFINED, + 0); VIR_INFO("Undefining network '%s'", network->def->name); if (!active) { @@ -2890,7 +2893,8 @@ static int networkCreate(virNetworkPtr net) { event = virNetworkEventLifecycleNew(network->def->name, network->def->uuid, - VIR_NETWORK_EVENT_STARTED); + VIR_NETWORK_EVENT_STARTED, + 0); cleanup: if (event) @@ -2930,7 +2934,8 @@ static int networkDestroy(virNetworkPtr net) { event = virNetworkEventLifecycleNew(network->def->name, network->def->uuid, - VIR_NETWORK_EVENT_STOPPED); + VIR_NETWORK_EVENT_STOPPED, + 0); if (!network->persistent) { if (networkRemoveInactive(driver, network) < 0) { diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7bd4b24..be282d6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4918,7 +4918,7 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, if (!net) return; - event = virNetworkEventLifecycleNew(net->name, net->uuid, msg->event); + event = virNetworkEventLifecycleNew(net->name, net->uuid, msg->event, msg->detail); virNetworkFree(net); remoteDomainEventQueue(priv, event); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 30d2636..a48404a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3542,7 +3542,8 @@ static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml) { net->active = 1; event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, - VIR_NETWORK_EVENT_STARTED); + VIR_NETWORK_EVENT_STARTED, + 0); ret = virGetNetwork(conn, net->def->name, net->def->uuid); @@ -3575,7 +3576,8 @@ virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml) net->persistent = 1; event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, - VIR_NETWORK_EVENT_DEFINED); + VIR_NETWORK_EVENT_DEFINED, + 0); ret = virGetNetwork(conn, net->def->name, net->def->uuid); @@ -3611,7 +3613,8 @@ static int testNetworkUndefine(virNetworkPtr network) { } event = virNetworkEventLifecycleNew(network->name, network->uuid, - VIR_NETWORK_EVENT_UNDEFINED); + VIR_NETWORK_EVENT_UNDEFINED, + 0); virNetworkRemoveInactive(&privconn->networks, privnet); @@ -3699,7 +3702,8 @@ static int testNetworkCreate(virNetworkPtr network) { privnet->active = 1; event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, - VIR_NETWORK_EVENT_STARTED); + VIR_NETWORK_EVENT_STARTED, + 0); ret = 0; cleanup: @@ -3727,7 +3731,8 @@ static int testNetworkDestroy(virNetworkPtr network) { privnet->active = 0; event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, - VIR_NETWORK_EVENT_STOPPED); + VIR_NETWORK_EVENT_STOPPED, + 0); if (!privnet->persistent) { virNetworkRemoveInactive(&privconn->networks, privnet);

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Instead of having the object event code have to know about each type of event and their dispatch functions, associate a dispatch function with the object instance. The dispatch code can thus be significantly simplified. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/conf/domain_event.c | 16 ++++++--- src/conf/domain_event.h | 7 ---- src/conf/network_event.c | 8 ++--- src/conf/network_event.h | 6 ---- src/conf/object_event.c | 72 +++++++++++------------------------------ src/conf/object_event_private.h | 9 +++++- 6 files changed, 42 insertions(+), 76 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 64035f7..a9c499e 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -61,6 +61,11 @@ static void virDomainEventTrayChangeDispose(void *obj); static void virDomainEventBalloonChangeDispose(void *obj); static void virDomainEventDeviceRemovedDispose(void *obj); +static void +virDomainEventDispatchDefaultFunc(virConnectPtr conn, + virObjectEventPtr event, + virConnectObjectEventGenericCallback cb, + void *cbopaque); struct _virDomainEvent { virObjectEvent parent; @@ -462,7 +467,9 @@ virDomainEventNew(virClassPtr klass, return NULL; } - if (!(event = virObjectEventNew(klass, eventID, + if (!(event = virObjectEventNew(klass, + virDomainEventDispatchDefaultFunc, + eventID, id, name, uuid))) return NULL; @@ -1160,12 +1167,11 @@ virDomainEventDeviceRemovedNewFromDom(virDomainPtr dom, } -void +static void virDomainEventDispatchDefaultFunc(virConnectPtr conn, virObjectEventPtr event, - virConnectDomainEventGenericCallback cb, - void *cbopaque, - void *opaque ATTRIBUTE_UNUSED) + virConnectObjectEventGenericCallback cb, + void *cbopaque) { virDomainPtr dom = virGetDomain(conn, event->meta.name, event->meta.uuid); int eventID = virObjectEventGetEventID(event); diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 30156ed..b2ea580 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -197,11 +197,4 @@ virDomainEventStateDeregister(virConnectPtr conn, virConnectDomainEventCallback callback) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -void -virDomainEventDispatchDefaultFunc(virConnectPtr conn, - virObjectEventPtr event, - virConnectDomainEventGenericCallback cb, - void *cbopaque, - void *opaque); - #endif diff --git a/src/conf/network_event.c b/src/conf/network_event.c index b1312b7..3173e68 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -87,12 +87,11 @@ virNetworkEventLifecycleDispose(void *obj) } -void +static void virNetworkEventDispatchDefaultFunc(virConnectPtr conn, virObjectEventPtr event, - virConnectNetworkEventGenericCallback cb ATTRIBUTE_UNUSED, - void *cbopaque ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virConnectObjectEventGenericCallback cb, + void *cbopaque) { virNetworkPtr net = virGetNetwork(conn, event->meta.name, event->meta.uuid); if (!net) @@ -171,6 +170,7 @@ virNetworkEventLifecycleNew(const char *name, return NULL; if (!(event = virObjectEventNew(virNetworkEventLifecycleClass, + virNetworkEventDispatchDefaultFunc, eventId, 0, name, uuid))) return NULL; diff --git a/src/conf/network_event.h b/src/conf/network_event.h index 1eef771..a1afbc5 100644 --- a/src/conf/network_event.h +++ b/src/conf/network_event.h @@ -43,10 +43,4 @@ virNetworkEventLifecycleNew(const char *name, int type, int detail); -void -virNetworkEventDispatchDefaultFunc(virConnectPtr conn, - virObjectEventPtr event, - virConnectNetworkEventGenericCallback cb, - void *cbopaque, - void *opaque); #endif diff --git a/src/conf/object_event.c b/src/conf/object_event.c index ec00aaf..96c719c 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -466,6 +466,7 @@ error: void * virObjectEventNew(virClassPtr klass, + virObjectEventDispatchFunc dispatcher, int eventID, int id, const char *name, @@ -486,6 +487,7 @@ virObjectEventNew(virClassPtr klass, if (!(event = virObjectNew(klass))) return NULL; + event->dispatch = dispatcher; event->eventID = eventID; if (VIR_STRDUP(event->meta.name, name) < 0) { @@ -527,13 +529,6 @@ virObjectEventQueuePush(virObjectEventQueuePtr evtQueue, } -typedef void (*virObjectEventDispatchFunc)(virConnectPtr conn, - virObjectEventPtr event, - virConnectObjectEventGenericCallback cb, - void *cbopaque, - void *opaque); - - static int virObjectEventDispatchMatchCallback(virObjectEventPtr event, virObjectEventCallbackPtr cb) @@ -563,10 +558,9 @@ virObjectEventDispatchMatchCallback(virObjectEventPtr event, static void -virObjectEventDispatch(virObjectEventPtr event, - virObjectEventCallbackListPtr callbacks, - virObjectEventDispatchFunc dispatch, - void *opaque) +virObjectEventStateDispatchCallbacks(virObjectEventStatePtr state, + virObjectEventPtr event, + virObjectEventCallbackListPtr callbacks) { size_t i; /* Cache this now, since we may be dropping the lock, @@ -578,25 +572,26 @@ virObjectEventDispatch(virObjectEventPtr event, if (!virObjectEventDispatchMatchCallback(event, callbacks->callbacks[i])) continue; - (*dispatch)(callbacks->callbacks[i]->conn, - event, - callbacks->callbacks[i]->cb, - callbacks->callbacks[i]->opaque, - opaque); + /* Drop the lock whle dispatching, for sake of re-entrancy */ + virObjectEventStateUnlock(state); + event->dispatch(callbacks->callbacks[i]->conn, + event, + callbacks->callbacks[i]->cb, + callbacks->callbacks[i]->opaque); + virObjectEventStateLock(state); } } static void -virObjectEventQueueDispatch(virObjectEventQueuePtr queue, - virObjectEventCallbackListPtr callbacks, - virObjectEventDispatchFunc dispatch, - void *opaque) +virObjectEventStateQueueDispatch(virObjectEventStatePtr state, + virObjectEventQueuePtr queue, + virObjectEventCallbackListPtr callbacks) { size_t i; for (i = 0; i < queue->count; i++) { - virObjectEventDispatch(queue->events[i], callbacks, dispatch, opaque); + virObjectEventStateDispatchCallbacks(state, queue->events[i], callbacks); virObjectUnref(queue->events[i]); } VIR_FREE(queue->events); @@ -626,34 +621,6 @@ virObjectEventStateQueue(virObjectEventStatePtr state, static void -virObjectEventStateDispatchFunc(virConnectPtr conn, - virObjectEventPtr event, - virConnectObjectEventGenericCallback cb, - void *cbopaque, - void *opaque) -{ - virObjectEventStatePtr state = opaque; - virEventNamespaceID namespace = (event->eventID & 0xFF00) >> 8; - - /* Drop the lock whle dispatching, for sake of re-entrancy */ - virObjectEventStateUnlock(state); - switch (namespace) { - case VIR_EVENT_NAMESPACE_DOMAIN: - virDomainEventDispatchDefaultFunc(conn, event, - VIR_DOMAIN_EVENT_CALLBACK(cb), cbopaque, NULL); - break; - case VIR_EVENT_NAMESPACE_NETWORK: - virNetworkEventDispatchDefaultFunc(conn, event, - VIR_NETWORK_EVENT_CALLBACK(cb), cbopaque, NULL); - break; - default: - VIR_ERROR(_("Unknown event namespace to dispatch")); - } - virObjectEventStateLock(state); -} - - -static void virObjectEventStateFlush(virObjectEventStatePtr state) { virObjectEventQueue tempQueue; @@ -669,10 +636,9 @@ virObjectEventStateFlush(virObjectEventStatePtr state) state->queue->events = NULL; virEventUpdateTimeout(state->timer, -1); - virObjectEventQueueDispatch(&tempQueue, - state->callbacks, - virObjectEventStateDispatchFunc, - state); + virObjectEventStateQueueDispatch(state, + &tempQueue, + state->callbacks); /* Purge any deleted callbacks */ virObjectEventCallbackListPurgeMarked(state->callbacks); diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h index f41f432..f18277a 100644 --- a/src/conf/object_event_private.h +++ b/src/conf/object_event_private.h @@ -69,10 +69,17 @@ struct _virObjectEventCallback { int deleted; }; +typedef void +(*virObjectEventDispatchFunc)(virConnectPtr conn, + virObjectEventPtr event, + virConnectObjectEventGenericCallback cb, + void *cbopaque); + struct _virObjectEvent { virObject parent; int eventID; virObjectMeta meta; + virObjectEventDispatchFunc dispatch; }; virClassPtr @@ -108,10 +115,10 @@ virObjectEventTimer(int timer, void * virObjectEventNew(virClassPtr klass, + virObjectEventDispatchFunc dispatcher, int eventID, int id, const char *name, const unsigned char *uuid); - #endif

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; The event namespace concept is mostly redundant information. With the re-written dispatcher, the namespace is only used for equality comparisons between event IDs. This can be solved by just comparing virClassPtr instances instead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/conf/domain_event.c | 11 +++++++++-- src/conf/network_event.c | 15 +++++++++------ src/conf/object_event.c | 17 ++++++++++++----- src/conf/object_event.h | 11 +++-------- src/conf/object_event_private.h | 2 ++ 5 files changed, 35 insertions(+), 21 deletions(-)

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/conf/object_event.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index aeee6d5..80b85bd 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -252,6 +252,11 @@ virObjectEventCallbackListAddID(virConnectPtr conn, size_t i; int ret = 0; + VIR_DEBUG("conn=%p cblist=%p uuid=%p name=%s id=%d " + "klass=%p eventID=%d callback=%p opaque=%p", + conn, cbList, uuid, name, id, klass, eventID, + callback, opaque); + /* Check incoming */ if (!cbList) { return -1;