[libvirt] [PATCH] remote:Fix the parameter passed to remoteDispatchConnectDomainEventDeregisterAny() should be eventID

[Eric Blake]

On 10/17/2013 03:37 AM, Wangyufei (A) wrote:
>>From 0832ab83685e20580c8128f5505096e71e747b8a Mon Sep 17 00:00:00 2001
> From: zhouyimin <zhouyimin at huawei.com>
> Date: Thu, 17 Oct 2013 15:59:21 +0800
> Subject: [PATCH] remote:Fix the parameter passed to remoteDispatchConnectDomainEventDeregisterAny() should be eventID

Subject line is too long - 'git shortlog -30' will give you a hint of
typical subjects, which we try to keep at 60 chars or less.  Better
would be:

remote: fix regression in event deregistration

> 
> Introduced by 7b87a3

Ouch - present since the 0.9.9 release.

> When I quit the process which only register VIR_DOMAIN_EVENT_ID_REBOOT, I got error like:
> "libvirt: XML-RPC error : internal error: domain event 0 not registered".
> Then I add the following code, it fixed.
> 
> Signed-off-by: zhouyimin <zhouyimin at huawei.com>

Thanks for the patch.  However, we prefer to have the Signed-off-by use
a legal name, rather than a login alias.  Given your cc: line, is it
okay if I rewrite this patch to use the following authorship:

From: Zhou Yimin <zhouyimin at huawei.com>

Or would you prefer yet another legal spelling?  UTF-8 is fine, if you'd
like to represent your name in native characters; some people even
choose to represent their name natively followed by a Latin form in ().

Once we've sorted that out, I can go ahead and push this.

> ---
>  src/remote/remote_driver.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
> index 87ef5a9..115d0bc 100644
> --- a/src/remote/remote_driver.c
> +++ b/src/remote/remote_driver.c
> @@ -5137,7 +5137,7 @@ static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn,
>      /* If that was the last callback for this eventID, we need to disable
>       * events on the server */
>      if (count == 0) {
> -        args.eventID = callbackID;
> +        args.eventID = eventID;
>  
>          if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY,
>                   (xdrproc_t) xdr_remote_connect_domain_event_deregister_any_args, (char *) &args,
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 621 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20131017/fc5ec7fe/attachment-0001.sig>