From: Juergen Gross Date: Fri, 2 Oct 2020 15:41:38 +0000 (+0200) Subject: tools/libs/store: ignore XS_OPEN_SOCKETONLY flag X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1536 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fa06cb8c38832aafe597d719040ba1d216e367b8;p=xen.git 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 Acked-by: Wei Liu --- diff --git a/tools/libs/store/include/xenstore.h b/tools/libs/store/include/xenstore.h index 25b31881c8..cbc7206a0f 100644 --- 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 aa1d24b8b9..320734416f 100644 --- 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))