From e69e600e6c866a4c30475fad08cded62087c45bb Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 22 Sep 2011 16:14:49 +0200
Subject: [PATCH] --- yaml --- r: 264446 b: refs/heads/master c:
 ddacf5ef684a655abe2bb50c4b2a5b72ae0d5e05 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/xen/xenbus/xenbus_xs.c     | 13 +++++++++++++
 trunk/include/xen/interface/io/xs_wire.h |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62da9804be92..02c2ccbbbdc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b082b25c006f9a4ca82af7bb5bdc289d98cf6b9
+refs/heads/master: ddacf5ef684a655abe2bb50c4b2a5b72ae0d5e05
diff --git a/trunk/drivers/xen/xenbus/xenbus_xs.c b/trunk/drivers/xen/xenbus/xenbus_xs.c
index 46347a49c5b8..d1071de11878 100644
--- a/trunk/drivers/xen/xenbus/xenbus_xs.c
+++ b/trunk/drivers/xen/xenbus/xenbus_xs.c
@@ -620,6 +620,15 @@ static struct xenbus_watch *find_watch(const char *token)
 	return NULL;
 }
 
+static void xs_reset_watches(void)
+{
+	int err;
+
+	err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL));
+	if (err && err != -EEXIST)
+		printk(KERN_WARNING "xs_reset_watches failed: %d\n", err);
+}
+
 /* Register callback to watch this node. */
 int register_xenbus_watch(struct xenbus_watch *watch)
 {
@@ -896,5 +905,9 @@ int xs_init(void)
 	if (IS_ERR(task))
 		return PTR_ERR(task);
 
+	/* shutdown watches for kexec boot */
+	if (xen_hvm_domain())
+		xs_reset_watches();
+
 	return 0;
 }
diff --git a/trunk/include/xen/interface/io/xs_wire.h b/trunk/include/xen/interface/io/xs_wire.h
index f6f07aa35af5..f0b6890370be 100644
--- a/trunk/include/xen/interface/io/xs_wire.h
+++ b/trunk/include/xen/interface/io/xs_wire.h
@@ -29,7 +29,8 @@ enum xsd_sockmsg_type
     XS_IS_DOMAIN_INTRODUCED,
     XS_RESUME,
     XS_SET_TARGET,
-    XS_RESTRICT
+    XS_RESTRICT,
+    XS_RESET_WATCHES
 };
 
 #define XS_WRITE_NONE "NONE"