diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-09 21:29:10 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-09 21:29:10 +0100 |
| commit | 25517fd2f2a26162a466a0933cb56c49373fbae7 (patch) | |
| tree | cc33fda73a2b22c572c17966c690303c1e2ccaa2 /tools/console | |
| parent | f2b39d8ae1082e6d2f364e5dab146d2396094cac (diff) | |
| download | xen-25517fd2f2a26162a466a0933cb56c49373fbae7.tar.gz xen-25517fd2f2a26162a466a0933cb56c49373fbae7.tar.bz2 xen-25517fd2f2a26162a466a0933cb56c49373fbae7.zip | |
Extend xenbus/xenstore client interface to include a transaction
handle on appropriate operations. Next step is to plug this
through to the store daemon and get rid of the nasty serialisation
mutex for transactions.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/console')
| -rw-r--r-- | tools/console/client/main.c | 4 | ||||
| -rw-r--r-- | tools/console/daemon/io.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 4c7b2710b8..0760f0cb9c 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -220,7 +220,7 @@ int main(int argc, char **argv) if (path == NULL) err(ENOMEM, "realloc"); strcat(path, "/console/tty"); - str_pty = xs_read(xs, path, &len); + str_pty = xs_read(xs, NULL, path, &len); /* FIXME consoled currently does not assume domain-0 doesn't have a console which is good when we break domain-0 up. To keep us @@ -245,7 +245,7 @@ int main(int argc, char **argv) struct timeval tv = { 0, 500 }; select(0, NULL, NULL, NULL, &tv); /* pause briefly */ - str_pty = xs_read(xs, path, &len); + str_pty = xs_read(xs, NULL, path, &len); } if (str_pty == NULL) { diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index d533bd9b5c..01fb0730fc 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -179,7 +179,7 @@ static int domain_create_tty(struct domain *dom) success = asprintf(&path, "%s/tty", dom->conspath) != -1; if (!success) goto out; - success = xs_write(xs, path, slave, strlen(slave)); + success = xs_write(xs, NULL, path, slave, strlen(slave)); free(path); if (!success) goto out; @@ -187,7 +187,7 @@ static int domain_create_tty(struct domain *dom) success = asprintf(&path, "%s/limit", dom->conspath) != -1; if (!success) goto out; - data = xs_read(xs, path, &len); + data = xs_read(xs, NULL, path, &len); if (data) { dom->buffer.max_capacity = strtoul(data, 0, 0); free(data); @@ -216,7 +216,7 @@ int xs_gather(struct xs_handle *xs, const char *dir, ...) char *p; asprintf(&path, "%s/%s", dir, name); - p = xs_read(xs, path, NULL); + p = xs_read(xs, NULL, path, NULL); free(path); if (p == NULL) { ret = ENOENT; |