From 4d309f7dbb762fe062783c1f0d6ad28d987075bd Mon Sep 17 00:00:00 2001 Message-Id: <4d309f7dbb762fe062783c1f0d6ad28d987075bd.1382534061.git.jdenemar@redhat.com> From: Zhou Yimin Date: Fri, 18 Oct 2013 15:13:33 +0200 Subject: [PATCH] remote: fix regression in event deregistration https://bugzilla.redhat.com/show_bug.cgi?id=1020376 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) Signed-off-by: Jiri Denemark --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 62e77a5..dcd433b 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, -- 1.8.4