diff options
| author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-12-14 16:56:54 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-12-14 16:56:54 +0000 |
| commit | d310383831923070727745af97776dcb6078e4f7 (patch) | |
| tree | ef7d1bfbeb7de4ecd05df033c1a6987ddc6f222d /tools/xenstore | |
| parent | 467a09d50d6768c8637e532a960f940fb9df2233 (diff) | |
| download | xen-d310383831923070727745af97776dcb6078e4f7.tar.gz xen-d310383831923070727745af97776dcb6078e4f7.tar.bz2 xen-d310383831923070727745af97776dcb6078e4f7.zip | |
xenstore: new XS_OPEN_SOCKETONLY flag; honour "-s" on tools' cmdline
The "-s" option to xenstore-ls is used by the xencommons startup
script to check whether xenstored is already running, before starting
it.
Since 22498:a40455ae9ad3, "-s" has been a no-op, and libxenstore will
always fall back to using xenbus. The combined effect is that the
xencommons script deadlocks: xenstore-ls hangs waiting for xenstored,
which isn't started by xencommons because xencommons is waiting for
xenstore-ls.
In this patch, we:
* Introduce a new XS_OPEN_SOCKETONLY flag which disables the
fallback behaviour;
* Make the xenstore command line tools use the new xs_open call
rather than the old, deprecated xs_open_* calls (which are
now identical).
* Plumb the xenstore command line tools "-s" option to set the
XS_OPEN_SOCKETONLY flag.
* Change the type of the XS_OPEN_* flags so that they naturally have
type unsigned long.
The "-s" option to xenstore-ls et al, and the XS_OPEN_SOCKETONLY flag,
are intended for use by toolstack infrastructure and should not
normally be used by higher-level code.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/xenstore')
| -rw-r--r-- | tools/xenstore/xenstore_client.c | 5 | ||||
| -rw-r--r-- | tools/xenstore/xs.c | 2 | ||||
| -rw-r--r-- | tools/xenstore/xs.h | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index fe63b6b0c8..94b82b99af 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -633,9 +633,8 @@ main(int argc, char **argv) max_width = ws.ws_col - 2; } - xsh = socket ? xs_daemon_open() : xs_domain_open(); - if (xsh == NULL) - err(1, socket ? "xs_daemon_open" : "xs_domain_open"); + xsh = xs_open(socket ? XS_OPEN_SOCKETONLY : 0); + if (xsh == NULL) err(1, "xs_open"); again: if (transaction) { diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index f3532b03c1..c72ea83d96 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -262,7 +262,7 @@ struct xs_handle *xs_open(unsigned long flags) else xsh = get_handle(xs_daemon_socket(), flags); - if (!xsh) + if (!xsh && !(flags & XS_OPEN_SOCKETONLY)) xsh = get_handle(xs_domain_dev(), flags); return xsh; diff --git a/tools/xenstore/xs.h b/tools/xenstore/xs.h index 1e28849eac..1cbe255a41 100644 --- a/tools/xenstore/xs.h +++ b/tools/xenstore/xs.h @@ -24,7 +24,8 @@ #define XBT_NULL 0 -#define XS_OPEN_READONLY 1<<0 +#define XS_OPEN_READONLY 1UL<<0 +#define XS_OPEN_SOCKETONLY 1UL<<1 struct xs_handle; typedef uint32_t xs_transaction_t; |