tools/libs/store: ignore XS_OPEN_SOCKETONLY flag

When opening the connection to Xenstore via xs_open() it makes no
sense to limit the connection to the socket based one. So just ignore
the XS_OPEN_SOCKETONLY flag.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Wei Liu <wl@xen.org>

diff --git a/tools/libs/store/include/xenstore.h b/tools/libs/store/include/xenstore.h
index 25b31881c8de65993786a8e42d7190376b00a2b9..cbc7206a0f72a095bce350c26cd14cfea384580c 100644 (file)
--- a/tools/libs/store/include/xenstore.h
+++ b/tools/libs/store/include/xenstore.h
@@ -66,8 +66,6 @@ typedef uint32_t xs_transaction_t;
  * * Connections made with xs_open(0) (which might be shared page or
  *   socket based) are only guaranteed to work in the parent after
  *   fork.
- * * Connections made with xs_open(XS_OPEN_SOCKETONLY) will be usable
- *   in either the parent or the child after fork, but not both.
  * * xs_daemon_open*() and xs_domain_open() are deprecated synonyms
  *   for xs_open(0).
  * * XS_OPEN_READONLY has no bearing on any of this.

diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c
index aa1d24b8b9a4d65d4cb8ff661f772807181b9139..320734416f70259da4281fe1a82e2ca8da0f138e 100644 (file)
--- a/tools/libs/store/xs.c
+++ b/tools/libs/store/xs.c
@@ -319,7 +319,7 @@ struct xs_handle *xs_open(unsigned long flags)
        else
                xsh = get_handle(xs_daemon_socket());
 
-       if (!xsh && !(flags & XS_OPEN_SOCKETONLY))
+       if (!xsh)
                xsh = get_handle(xs_domain_dev());
 
        if (xsh && (flags & XS_UNWATCH_FILTER))