[libvirt] [PATCH] events: Don't fail on registering events for two different domains

[Michal Privoznik]

On 27.06.2012 14:12, Michal Privoznik wrote:
> 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.
> ---
>  src/conf/domain_event.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
> index 4ecc413..3cfd940 100644
> --- 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;
> 

So after all - ACK or NACK?

Michal