]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
remote: fix regression in event deregistration
authorZhou Yimin <zhouyimin@huawei.com>
Thu, 17 Oct 2013 07:59:21 +0000 (15:59 +0800)
committerEric Blake <eblake@redhat.com>
Fri, 18 Oct 2013 13:56:11 +0000 (07:56 -0600)
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 <zhouyimin@huawei.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 9712c2510ec87a87578576a407768380e250a6a4)

src/remote/remote_driver.c

index 657364f4e697a68725a55e1690e06b068b9b54f0..fde2a3aff5135c882cc6dd020e2cacce4a49bbd1 100644 (file)
@@ -5062,7 +5062,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,