From: Ian Jackson <ian.jackson@citrix.com>
Date: Mon, 15 Oct 2018 11:11:32 +0000 (+0100)
Subject: Revert "tools-xenstore-compatibility.diff"
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=48e323cf828625e3685d0ab8bd956c641c871258;p=xen.git

Revert "tools-xenstore-compatibility.diff"

Following recent discussion in pkg-xen-devel and xen-devel,
  https://lists.xenproject.org/archives/html/xen-devel/2018-10/msg00838.html
I am dropping this patch.

For now I revert it.  When we next debrebase, we can (if we like)
throw away both the original patch, and this revert.

This reverts commit 5047884c76849b67e364bc525d1b3b55e781cf16.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
---

diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h
index edf62718b4..0d95bb0e5c 100644
--- a/tools/xenstore/include/xenstore.h
+++ b/tools/xenstore/include/xenstore.h
@@ -25,7 +25,6 @@
 
 #define XS_OPEN_READONLY	1UL<<0
 #define XS_OPEN_SOCKETONLY      1UL<<1
-#define XS_OPEN_DOMAINONLY      1UL<<2
 
 /*
  * Setting XS_UNWATCH_FILTER arranges that after xs_unwatch, no
diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c
index d7ae1ec0c2..3d14d37e62 100644
--- a/tools/xenstore/xenstore_client.c
+++ b/tools/xenstore/xenstore_client.c
@@ -636,7 +636,7 @@ main(int argc, char **argv)
 	    max_width = ws.ws_col - 2;
     }
 
-    xsh = xs_open(socket ? XS_OPEN_SOCKETONLY : XS_OPEN_DOMAINONLY);
+    xsh = xs_open(socket ? XS_OPEN_SOCKETONLY : 0);
     if (xsh == NULL) err(1, "xs_open");
 
 again:
diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
index 4e99bf8231..cbcebb2bce 100644
--- a/tools/xenstore/xs.c
+++ b/tools/xenstore/xs.c
@@ -307,19 +307,17 @@ struct xs_handle *xs_daemon_open_readonly(void)
 
 struct xs_handle *xs_domain_open(void)
 {
-	return xs_open(XS_OPEN_DOMAINONLY);
+	return xs_open(0);
 }
 
 struct xs_handle *xs_open(unsigned long flags)
 {
 	struct xs_handle *xsh = NULL;
 
-	if (!(flags & XS_OPEN_DOMAINONLY)) {
 	if (flags & XS_OPEN_READONLY)
 		xsh = get_handle(xs_daemon_socket_ro());
 	else
 		xsh = get_handle(xs_daemon_socket());
-	}
 
 	if (!xsh && !(flags & XS_OPEN_SOCKETONLY))
 		xsh = get_handle(xs_domain_dev());