From: Zhou Yimin Date: Thu, 17 Oct 2013 07:59:21 +0000 (+0800) Subject: remote: fix regression in event deregistration X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb250de38c906b4eb37b88da44055a324ac06487;p=thirdparty%2Flibvirt.git remote: fix regression in event deregistration Introduced by 7b87a3 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: Zhou Yimin Signed-off-by: Eric Blake (cherry picked from commit 9712c2510ec87a87578576a407768380e250a6a4) --- diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 3721af9b17..f967d8d82e 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5027,7 +5027,7 @@ static int remoteDomainEventDeregisterAny(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_DOMAIN_EVENTS_DEREGISTER_ANY, (xdrproc_t) xdr_remote_domain_events_deregister_any_args, (char *) &args,