From 8a9695a79b47310be28a954b51b94dd8f6c9debe Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 15 Oct 2018 12:11:32 +0100 Subject: [PATCH] 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 Gbp-Pq: Name 0042-Revert-tools-xenstore-compatibility.diff.patch --- tools/xenstore/include/xenstore.h | 1 - tools/xenstore/xenstore_client.c | 2 +- tools/xenstore/xs.c | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) 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()); -- 2.30.2