|
 |
43fe83 |
From 4d309f7dbb762fe062783c1f0d6ad28d987075bd Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <4d309f7dbb762fe062783c1f0d6ad28d987075bd.1382534061.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Zhou Yimin <zhouyimin@huawei.com>
|
|
|
43fe83 |
Date: Fri, 18 Oct 2013 15:13:33 +0200
|
|
|
43fe83 |
Subject: [PATCH] remote: fix regression in event deregistration
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1020376
|
|
|
43fe83 |
|
|
|
43fe83 |
Introduced by 7b87a3
|
|
|
43fe83 |
When I quit the process which only register VIR_DOMAIN_EVENT_ID_REBOOT,
|
|
|
43fe83 |
I got error like:
|
|
|
43fe83 |
"libvirt: XML-RPC error : internal error: domain event 0 not registered".
|
|
|
43fe83 |
Then I add the following code, it fixed.
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Zhou Yimin <zhouyimin@huawei.com>
|
|
|
43fe83 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
43fe83 |
(cherry picked from commit 9712c2510ec87a87578576a407768380e250a6a4)
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/remote/remote_driver.c | 2 +-
|
|
|
43fe83 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
|
|
|
43fe83 |
index 62e77a5..dcd433b 100644
|
|
|
43fe83 |
--- a/src/remote/remote_driver.c
|
|
|
43fe83 |
+++ b/src/remote/remote_driver.c
|
|
|
43fe83 |
@@ -5137,7 +5137,7 @@ static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn,
|
|
|
43fe83 |
/* If that was the last callback for this eventID, we need to disable
|
|
|
43fe83 |
* events on the server */
|
|
|
43fe83 |
if (count == 0) {
|
|
|
43fe83 |
- args.eventID = callbackID;
|
|
|
43fe83 |
+ args.eventID = eventID;
|
|
|
43fe83 |
|
|
|
43fe83 |
if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY,
|
|
|
43fe83 |
(xdrproc_t) xdr_remote_connect_domain_event_deregister_any_args, (char *) &args,
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4
|
|
|
43fe83 |
|