# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 5c954929bb0d9ecafc144c433b68e7d65a9e5453
# Parent 049dee79c76d93474ab3a5bcaf28bedbf8246732
# Parent 0dd531d4af4690ce99688b538fcd13a29f3af88a
Merged.
diff -r 049dee79c76d -r 5c954929bb0d
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Fri Nov 18
15:31:50 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Fri Nov 18
15:32:04 2005
@@ -199,6 +199,7 @@
int err;
msg.tx_id = (u32)(unsigned long)t;
+ msg.req_id = 0;
msg.type = type;
msg.len = 0;
for (i = 0; i < num_vecs; i++)
diff -r 049dee79c76d -r 5c954929bb0d tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Fri Nov 18 15:31:50 2005
+++ b/tools/python/xen/lowlevel/xc/xc.c Fri Nov 18 15:32:04 2005
@@ -49,19 +49,16 @@
if ( !PyArg_ParseTupleAndKeywords(args, kwds, "is", kwd_list,
&dom, &corefile) )
- goto exit;
+ return NULL;
if ( (corefile == NULL) || (corefile[0] == '\0') )
- goto exit;
+ return NULL;
if ( xc_domain_dumpcore(xc->xc_handle, dom, corefile) != 0 )
return PyErr_SetFromErrno(xc_error);
Py_INCREF(zero);
return zero;
-
- exit:
- return NULL;
}
static PyObject *pyxc_handle(PyObject *self)
@@ -95,12 +92,7 @@
{
if ( !PyList_Check(pyhandle) ||
(PyList_Size(pyhandle) != sizeof(xen_domain_handle_t)) )
- {
- out_exception:
- errno = EINVAL;
- PyErr_SetFromErrno(xc_error);
- return NULL;
- }
+ goto out_exception;
for ( i = 0; i < sizeof(xen_domain_handle_t); i++ )
{
@@ -115,6 +107,11 @@
return PyErr_SetFromErrno(xc_error);
return PyInt_FromLong(dom);
+
+out_exception:
+ errno = EINVAL;
+ PyErr_SetFromErrno(xc_error);
+ return NULL;
}
static PyObject *pyxc_domain_max_vcpus(PyObject *self,
@@ -270,10 +267,7 @@
if ( !PyList_Check(pyhandle) ||
(PyList_Size(pyhandle) != sizeof(xen_domain_handle_t)) )
{
- out_exception:
- errno = EINVAL;
- PyErr_SetFromErrno(xc_error);
- return NULL;
+ goto out_exception;
}
for ( i = 0; i < sizeof(xen_domain_handle_t); i++ )
@@ -289,7 +283,13 @@
Py_INCREF(zero);
return zero;
-}
+
+out_exception:
+ errno = EINVAL;
+ PyErr_SetFromErrno(xc_error);
+ return NULL;
+}
+
static PyObject *pyxc_domain_getinfo(PyObject *self,
PyObject *args,
diff -r 049dee79c76d -r 5c954929bb0d tools/python/xen/lowlevel/xs/xs.c
--- a/tools/python/xen/lowlevel/xs/xs.c Fri Nov 18 15:31:50 2005
+++ b/tools/python/xen/lowlevel/xs/xs.c Fri Nov 18 15:32:04 2005
@@ -21,6 +21,7 @@
#include <Python.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -70,6 +71,17 @@
: PyErr_SetFromErrno(PyExc_RuntimeError));
}
+static void remove_watch(XsHandle *xsh, PyObject *token);
+
+static PyObject *none(bool result);
+
+static int parse_transaction_path(PyObject *self, PyObject *args,
+ PyObject *kwds,
+ struct xs_handle **xh,
+ struct xs_transaction_handle **th,
+ char **path);
+
+
#define xspy_read_doc "\n" \
"Read data from a path.\n" \
" path [string]: xenstore path\n" \
@@ -81,42 +93,29 @@
static PyObject *xspy_read(PyObject *self, PyObject *args, PyObject *kwds)
{
- static char *kwd_spec[] = { "transaction", "path", NULL };
- static char *arg_spec = "ss";
- char *path = NULL;
-
- struct xs_handle *xh = xshandle(self);
- char *xsval = NULL;
- unsigned int xsval_n = 0;
- PyObject *val = NULL;
-
+ struct xs_handle *xh;
struct xs_transaction_handle *th;
- char *thstr;
-
- if (!xh)
- goto exit;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
- &thstr, &path))
- goto exit;
-
- th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
+ char *path;
+
+ char *xsval;
+ unsigned int xsval_n;
+
+ if (!parse_transaction_path(self, args, kwds, &xh, &th, &path))
+ return NULL;
Py_BEGIN_ALLOW_THREADS
xsval = xs_read(xh, th, path, &xsval_n);
Py_END_ALLOW_THREADS
- if (!xsval) {
- if (errno == ENOENT) {
- Py_INCREF(Py_None);
- val = Py_None;
- } else
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- val = PyString_FromStringAndSize(xsval, xsval_n);
- exit:
- free(xsval);
- return val;
-}
+ if (xsval) {
+ PyObject *val = PyString_FromStringAndSize(xsval, xsval_n);
+ free(xsval);
+ return val;
+ }
+ else {
+ return none(errno == ENOENT);
+ }
+}
+
#define xspy_write_doc "\n" \
"Write data to a path.\n" \
@@ -136,32 +135,26 @@
int data_n = 0;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- int xsval = 0;
+ bool result;
struct xs_transaction_handle *th;
char *thstr;
if (!xh)
- goto exit;
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
&thstr, &path, &data, &data_n))
- goto exit;
+ return NULL;
th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
Py_BEGIN_ALLOW_THREADS
- xsval = xs_write(xh, th, path, data, data_n);
- Py_END_ALLOW_THREADS
- if (!xsval) {
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- Py_INCREF(Py_None);
- val = Py_None;
- exit:
- return val;
-}
+ result = xs_write(xh, th, path, data, data_n);
+ Py_END_ALLOW_THREADS
+
+ return none(result);
+}
+
#define xspy_ls_doc "\n" \
"List a directory.\n" \
@@ -174,46 +167,33 @@
static PyObject *xspy_ls(PyObject *self, PyObject *args, PyObject *kwds)
{
- static char *kwd_spec[] = { "transaction", "path", NULL };
- static char *arg_spec = "ss";
- char *path = NULL;
-
- struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- char **xsval = NULL;
- unsigned int xsval_n = 0;
- int i;
-
+ struct xs_handle *xh;
struct xs_transaction_handle *th;
- char *thstr;
-
- if (!xh)
- goto exit;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
- &thstr, &path))
- goto exit;
-
-
- th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
+ char *path;
+
+ char **xsval;
+ int xsval_n;
+
+ if (!parse_transaction_path(self, args, kwds, &xh, &th, &path))
+ return NULL;
Py_BEGIN_ALLOW_THREADS
xsval = xs_directory(xh, th, path, &xsval_n);
Py_END_ALLOW_THREADS
- if (!xsval) {
- if (errno == ENOENT) {
- Py_INCREF(Py_None);
- val = Py_None;
- } else
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- val = PyList_New(xsval_n);
- for (i = 0; i < xsval_n; i++)
- PyList_SetItem(val, i, PyString_FromString(xsval[i]));
- free(xsval);
- exit:
- return val;
-}
+
+ if (xsval) {
+ int i;
+ PyObject *val = PyList_New(xsval_n);
+ for (i = 0; i < xsval_n; i++)
+ PyList_SetItem(val, i, PyString_FromString(xsval[i]));
+ free(xsval);
+ return val;
+ }
+ else {
+ return none(errno == ENOENT);
+ }
+}
+
#define xspy_mkdir_doc "\n" \
"Make a directory.\n" \
@@ -225,37 +205,22 @@
static PyObject *xspy_mkdir(PyObject *self, PyObject *args, PyObject *kwds)
{
- static char *kwd_spec[] = { "transaction", "path", NULL };
- static char *arg_spec = "ss";
- char *path = NULL;
-
- struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- int xsval = 0;
-
+ struct xs_handle *xh;
struct xs_transaction_handle *th;
- char *thstr;
-
- if (!xh)
- goto exit;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
- &thstr, &path))
- goto exit;
-
- th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
-
- Py_BEGIN_ALLOW_THREADS
- xsval = xs_mkdir(xh, th, path);
- Py_END_ALLOW_THREADS
- if (!xsval) {
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- Py_INCREF(Py_None);
- val = Py_None;
- exit:
- return val;
-}
+ char *path;
+
+ bool result;
+
+ if (!parse_transaction_path(self, args, kwds, &xh, &th, &path))
+ return NULL;
+
+ Py_BEGIN_ALLOW_THREADS
+ result = xs_mkdir(xh, th, path);
+ Py_END_ALLOW_THREADS
+
+ return none(result);
+}
+
#define xspy_rm_doc "\n" \
"Remove a path.\n" \
@@ -267,37 +232,22 @@
static PyObject *xspy_rm(PyObject *self, PyObject *args, PyObject *kwds)
{
- static char *kwd_spec[] = { "transaction", "path", NULL };
- static char *arg_spec = "ss";
- char *path = NULL;
-
- struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- int xsval = 0;
-
+ struct xs_handle *xh;
struct xs_transaction_handle *th;
- char *thstr;
-
- if (!xh)
- goto exit;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
- &thstr, &path))
- goto exit;
-
- th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
-
- Py_BEGIN_ALLOW_THREADS
- xsval = xs_rm(xh, th, path);
- Py_END_ALLOW_THREADS
- if (!xsval && errno != ENOENT) {
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- Py_INCREF(Py_None);
- val = Py_None;
- exit:
- return val;
-}
+ char *path;
+
+ bool result;
+
+ if (!parse_transaction_path(self, args, kwds, &xh, &th, &path))
+ return NULL;
+
+ Py_BEGIN_ALLOW_THREADS
+ result = xs_rm(xh, th, path);
+ Py_END_ALLOW_THREADS
+
+ return none(result || errno == ENOENT);
+}
+
#define xspy_get_permissions_doc "\n" \
"Get the permissions for a path\n" \
@@ -315,7 +265,6 @@
char *path = NULL;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
struct xs_permissions *perms;
unsigned int perms_n = 0;
int i;
@@ -324,30 +273,34 @@
char *thstr;
if (!xh)
- goto exit;
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
&thstr, &path))
- goto exit;
+ return NULL;
th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
Py_BEGIN_ALLOW_THREADS
perms = xs_get_permissions(xh, th, path, &perms_n);
Py_END_ALLOW_THREADS
- if (!perms) {
+
+ if (perms) {
+ PyObject *val = PyList_New(perms_n);
+ for (i = 0; i < perms_n; i++, perms++) {
+ PyObject *p = Py_BuildValue("{s:i,s:i,s:i}",
+ "dom", perms->id,
+ "read", perms->perms & XS_PERM_READ,
+ "write",perms->perms & XS_PERM_WRITE);
+ PyList_SetItem(val, i, p);
+ }
+
+ free(perms);
+ return val;
+ }
+ else {
PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- val = PyList_New(perms_n);
- for (i = 0; i < perms_n; i++, perms++) {
- PyObject *p = Py_BuildValue("{s:i,s:i,s:i}",
- "dom", perms->id,
- "read", (perms->perms & XS_PERM_READ),
- "write", (perms->perms & XS_PERM_WRITE));
- PyList_SetItem(val, i, p);
- }
- exit:
- return val;
+ return NULL;
+ }
}
#define xspy_set_permissions_doc "\n" \
@@ -370,7 +323,7 @@
static char *perm_spec = "i|iiii";
struct xs_handle *xh = xshandle(self);
- int i, xsval;
+ int i, result;
struct xs_permissions *xsperms = NULL;
int xsperms_n = 0;
PyObject *tuple0 = NULL;
@@ -416,9 +369,9 @@
xsperms[i].perms |= XS_PERM_WRITE;
}
Py_BEGIN_ALLOW_THREADS
- xsval = xs_set_permissions(xh, th, path, xsperms, xsperms_n);
- Py_END_ALLOW_THREADS
- if (!xsval) {
+ result = xs_set_permissions(xh, th, path, xsperms, xsperms_n);
+ Py_END_ALLOW_THREADS
+ if (!result) {
PyErr_SetFromErrno(PyExc_RuntimeError);
goto exit;
}
@@ -453,7 +406,7 @@
XsHandle *xsh = (XsHandle *)self;
struct xs_handle *xh = xshandle(self);
- int xsval = 0;
+ int result = 0;
if (!xh)
return NULL;
@@ -466,10 +419,9 @@
races with xs_read_watch.
*/
- Py_INCREF(token);
for (i = 0; i < PyList_Size(xsh->watches); i++) {
if (PyList_GetItem(xsh->watches, i) == Py_None) {
- PyList_SetItem(xsh->watches, i, token);
+ PySequence_SetItem(xsh->watches, i, token);
break;
}
}
@@ -478,24 +430,15 @@
sprintf(token_str, "%li", (unsigned long)token);
Py_BEGIN_ALLOW_THREADS
- xsval = xs_watch(xh, path, token_str);
- Py_END_ALLOW_THREADS
- if (!xsval) {
- for (i = 0; i < PyList_Size(xsh->watches); i++) {
- if (PyList_GetItem(xsh->watches, i) == token) {
- Py_INCREF(Py_None);
- PyList_SetItem(xsh->watches, i, Py_None);
- break;
- }
- }
-
- PyErr_SetFromErrno(PyExc_RuntimeError);
- return NULL;
- }
-
- Py_INCREF(Py_None);
- return Py_None;
-}
+ result = xs_watch(xh, path, token_str);
+ Py_END_ALLOW_THREADS
+
+ if (!result)
+ remove_watch(xsh, token);
+
+ return none(result);
+}
+
#define xspy_read_watch_doc "\n" \
"Read a watch notification.\n" \
@@ -519,9 +462,10 @@
unsigned int num;
if (!xh)
- goto exit;
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec))
- goto exit;
+ return NULL;
+
again:
Py_BEGIN_ALLOW_THREADS
xsval = xs_read_watch(xh, &num);
@@ -570,37 +514,25 @@
char *path = NULL;
PyObject *token;
char token_str[MAX_STRLEN(unsigned long) + 1];
- int i;
XsHandle *xsh = (XsHandle *)self;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- int xsval = 0;
-
- if (!xh)
- goto exit;
+ int result = 0;
+
+ if (!xh)
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec, &path,
&token))
- goto exit;
+ return NULL;
+
sprintf(token_str, "%li", (unsigned long)token);
Py_BEGIN_ALLOW_THREADS
- xsval = xs_unwatch(xh, path, token_str);
- Py_END_ALLOW_THREADS
- if (!xsval)
- PyErr_SetFromErrno(PyExc_RuntimeError);
- else {
- Py_INCREF(Py_None);
- val = Py_None;
- }
- for (i = 0; i < PyList_Size(xsh->watches); i++) {
- if (token == PyList_GetItem(xsh->watches, i)) {
- Py_INCREF(Py_None);
- PyList_SetItem(xsh->watches, i, Py_None);
- break;
- }
- }
- exit:
- return val;
+ result = xs_unwatch(xh, path, token_str);
+ Py_END_ALLOW_THREADS
+
+ remove_watch(xsh, token);
+
+ return none(result);
}
#define xspy_transaction_start_doc "\n" \
@@ -618,26 +550,25 @@
char *path = NULL;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
struct xs_transaction_handle *th;
char thstr[20];
if (!xh)
- goto exit;
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec, &path))
- goto exit;
+ return NULL;
+
Py_BEGIN_ALLOW_THREADS
th = xs_transaction_start(xh);
Py_END_ALLOW_THREADS
+
if (th == NULL) {
PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
+ return NULL;
}
sprintf(thstr, "%lX", (unsigned long)th);
- val = PyString_FromString(thstr);
- exit:
- return val;
+ return PyString_FromString(thstr);
}
#define xspy_transaction_end_doc "\n" \
@@ -657,37 +588,37 @@
int abort = 0;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- int xsval = 0;
+ bool result;
struct xs_transaction_handle *th;
char *thstr;
if (!xh)
- goto exit;
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
&thstr, &abort))
- goto exit;
+ return NULL;
th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
Py_BEGIN_ALLOW_THREADS
- xsval = xs_transaction_end(xh, th, abort);
- Py_END_ALLOW_THREADS
- if (!xsval) {
- if (errno == EAGAIN) {
- Py_INCREF(Py_False);
- val = Py_False;
- goto exit;
- }
+ result = xs_transaction_end(xh, th, abort);
+ Py_END_ALLOW_THREADS
+
+ if (result) {
+ Py_INCREF(Py_True);
+ return Py_True;
+ }
+ else if (errno == EAGAIN) {
+ Py_INCREF(Py_False);
+ return Py_False;
+ }
+ else {
PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- Py_INCREF(Py_True);
- val = Py_True;
- exit:
- return val;
-}
+ return NULL;
+ }
+}
+
#define xspy_introduce_domain_doc "\n" \
"Tell xenstore about a domain so it can talk to it.\n" \
@@ -709,26 +640,21 @@
unsigned int port = 0;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- int xsval = 0;
-
- if (!xh)
- goto exit;
+ bool result = 0;
+
+ if (!xh)
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
&dom, &page, &port))
- goto exit;
- Py_BEGIN_ALLOW_THREADS
- xsval = xs_introduce_domain(xh, dom, page, port);
- Py_END_ALLOW_THREADS
- if (!xsval) {
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- Py_INCREF(Py_None);
- val = Py_None;
- exit:
- return val;
-}
+ return NULL;
+
+ Py_BEGIN_ALLOW_THREADS
+ result = xs_introduce_domain(xh, dom, page, port);
+ Py_END_ALLOW_THREADS
+
+ return none(result);
+}
+
#define xspy_release_domain_doc "\n" \
"Tell xenstore to release its channel to a domain.\n" \
@@ -743,30 +669,25 @@
PyObject *kwds)
{
static char *kwd_spec[] = { "dom", NULL };
- static char *arg_spec = "i|";
+ static char *arg_spec = "i";
domid_t dom;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
- int xsval = 0;
-
- if (!xh)
- goto exit;
+ bool result = 0;
+
+ if (!xh)
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
&dom))
- goto exit;
- Py_BEGIN_ALLOW_THREADS
- xsval = xs_release_domain(xh, dom);
- Py_END_ALLOW_THREADS
- if (!xsval) {
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- Py_INCREF(Py_None);
- val = Py_None;
- exit:
- return val;
-}
+ return NULL;
+
+ Py_BEGIN_ALLOW_THREADS
+ result = xs_release_domain(xh, dom);
+ Py_END_ALLOW_THREADS
+
+ return none(result);
+}
+
#define xspy_close_doc "\n" \
"Close the connection to xenstore.\n" \
@@ -783,24 +704,24 @@
XsHandle *xsh = (XsHandle *)self;
struct xs_handle *xh = xshandle(self);
- PyObject *val = NULL;
-
- if (!xh)
- goto exit;
+
+ if (!xh)
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec))
- goto exit;
+ return NULL;
+
for (i = 0; i < PyList_Size(xsh->watches); i++) {
/* TODO: xs_unwatch watches */
- Py_INCREF(Py_None);
- PyList_SetItem(xsh->watches, i, Py_None);
- }
+ PySequence_SetItem(xsh->watches, i, Py_None);
+ }
+
xs_daemon_close(xh);
xsh->xh = NULL;
+
Py_INCREF(Py_None);
- val = Py_None;
- exit:
- return val;
-}
+ return Py_None;
+}
+
#define xspy_get_domain_path_doc "\n" \
"Return store path of domain, whether or not the domain exists.\n" \
@@ -819,29 +740,90 @@
struct xs_handle *xh = xshandle(self);
char *xsval = NULL;
- PyObject *val = NULL;
-
- if (!xh)
- goto exit;
+
+ if (!xh)
+ return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
&domid))
- goto exit;
+ return NULL;
+
Py_BEGIN_ALLOW_THREADS
xsval = xs_get_domain_path(xh, domid);
Py_END_ALLOW_THREADS
- if (!xsval) {
- if (errno == ENOENT) {
- Py_INCREF(Py_None);
- val = Py_None;
- } else
- PyErr_SetFromErrno(PyExc_RuntimeError);
- goto exit;
- }
- val = PyString_FromString(xsval);
- free(xsval);
- exit:
- return val;
-}
+
+ if (xsval) {
+ PyObject *val = PyString_FromString(xsval);
+ free(xsval);
+ return val;
+ }
+ else {
+ return none(errno == ENOENT);
+ }
+}
+
+
+/**
+ * Remove the given token from the watches list belonging to the given
+ * XsHandle, if present.
+ */
+static void remove_watch(XsHandle *xsh, PyObject *token)
+{
+ int i;
+
+ for (i = 0; i < PyList_Size(xsh->watches); i++) {
+ if (PyList_GetItem(xsh->watches, i) == token) {
+ PySequence_SetItem(xsh->watches, i, Py_None);
+ return;
+ }
+ }
+}
+
+
+/**
+ * Parse transaction and path arguments from the given args and kwds,
+ * convert the given self value to an xs_handle, and return all three by
+ * reference.
+ *
+ * @return 1 on success, in which case *xh, *th, and *path are valid, or 0 on
+ * failure.
+ */
+static int parse_transaction_path(PyObject *self, PyObject *args,
+ PyObject *kwds,
+ struct xs_handle **xh,
+ struct xs_transaction_handle **th,
+ char **path)
+{
+ static char *arg_spec = "ss";
+ static char *kwd_spec[] = { "transaction", "path", NULL };
+ char *thstr;
+
+ *xh = xshandle(self);
+
+ if (!xh)
+ return 0;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, arg_spec, kwd_spec,
+ &thstr, path))
+ return 0;
+
+ *th = (struct xs_transaction_handle *)strtoul(thstr, NULL, 16);
+
+ return 1;
+}
+
+
+static PyObject *none(bool result)
+{
+ if (result) {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+ else {
+ PyErr_SetFromErrno(PyExc_RuntimeError);
+ return NULL;
+ }
+}
+
#define XSPY_METH(_name) { \
.ml_name = #_name, \
@@ -871,9 +853,7 @@
static PyObject *xshandle_getattr(PyObject *self, char *name)
{
- PyObject *val = NULL;
- val = Py_FindMethod(xshandle_methods, self, name);
- return val;
+ return Py_FindMethod(xshandle_methods, self, name);
}
static void xshandle_dealloc(PyObject *self)
diff -r 049dee79c76d -r 5c954929bb0d tools/xenstore/xs.c
--- a/tools/xenstore/xs.c Fri Nov 18 15:31:50 2005
+++ b/tools/xenstore/xs.c Fri Nov 18 15:32:04 2005
@@ -305,6 +305,7 @@
struct sigaction ignorepipe, oldact;
msg.tx_id = (uint32_t)(unsigned long)t;
+ msg.req_id = 0;
msg.type = type;
msg.len = 0;
for (i = 0; i < num_vecs; i++)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home