events: Don't fail on registering events for two different domains

virConnectDomainEventRegisterAny() takes a domain as an argument.
So it should be possible to register the same event (be it
VIR_DOMAIN_EVENT_ID_LIFECYCLE for example) for two different domains.
That is, we need to take domain into account when searching for
duplicate event being already registered.
(cherry picked from commit cd15303fd123146b0ba53e387d08ef22b707223c)

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 4ecc4135028ff310f18ffc72e9e022c4cbcf3d90..3cfd940c69142fd8f57c4c2bfbd30f6aaa774236 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -363,7 +363,11 @@ virDomainEventCallbackListAddID(virConnectPtr conn,
     for (i = 0 ; i < cbList->count ; i++) {
         if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback) &&
             cbList->callbacks[i]->eventID == eventID &&
-            cbList->callbacks[i]->conn == conn) {
+            cbList->callbacks[i]->conn == conn &&
+            ((dom && cbList->callbacks[i]->dom &&
+              memcmp(cbList->callbacks[i]->dom->uuid,
+                     dom->uuid, VIR_UUID_BUFLEN) == 0) ||
+             (!dom && !cbList->callbacks[i]->dom))) {
             eventReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                              _("event callback already tracked"));
             return -1;