From 406c05f2e711f43a1a113be328223fad337fbb0f Mon Sep 17 00:00:00 2001
From: John Levon <john.levon@sun.com>
Date: Thu, 15 Jan 2009 01:23:32 +0000
Subject: [PATCH] Fix xs_unwatch() to correctly pass the token

---
 ChangeLog         | 5 +++++
 src/xs_internal.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f71e040ed4..bd4a78178b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 15 01:22:32 GMT 2009  John Levon  <levon@movementarian.org>
+
+	* src/xs_internal.c: Fix xs_unwatch() to correctly pass the
+	token
+
 Thu Jan 15 01:19:02 GMT 2009  John Levon  <levon@movementarian.org>
 
 	* src/xen_unified.c:
diff --git a/src/xs_internal.c b/src/xs_internal.c
index 80c30bd1f6..5c7ce2f0cb 100644
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -1106,7 +1106,7 @@ int xenStoreRemoveWatch(virConnectPtr conn,
 
             if (!xs_unwatch(priv->xshandle,
                        list->watches[i]->path,
-                       list->watches[i]->path))
+                       list->watches[i]->token))
             {
                 DEBUG0("WARNING: Could not remove watch");
                 /* Not fatal, continue */