X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=python%2F_libvserver.c;h=53a46d8c928b2937954c7cfa30d05bef1be78b12;hb=1bd485daf1544e9b7b9bf020783f6aa0b0085c0b;hp=dfba4e69fdf5c8a3e8c5c0152f0c3f5c607f259f;hpb=b7c0d77d8f00698213c7a5601bbe89a55878607f;p=util-vserver.git diff --git a/python/_libvserver.c b/python/_libvserver.c index dfba4e6..53a46d8 100644 --- a/python/_libvserver.c +++ b/python/_libvserver.c @@ -1,4 +1,4 @@ -/* +/* $Id$ * Copyright (C) 2008 Daniel Hokka Zakrisson * * This program is free software; you can redistribute it and/or @@ -39,7 +39,6 @@ static inline PyObject *NONE(void) } static PyObject * - pyvserver_get_version(PyObject UNUSED *self, PyObject UNUSED *args) { int ver = vc_get_version(); @@ -120,7 +119,7 @@ pyvserver_virt_stat(PyObject UNUSED *self, PyObject *args) if (vc_virt_stat(xid, &stats) == -1) return PyErr_SetFromErrno(PyExc_OSError); - return Py_BuildValue("(KKIIIII(III))", stats.offset, stats.uptime, + return Py_BuildValue("(KKIIIIIIII)", stats.offset, stats.uptime, stats.nr_threads, stats.nr_running, stats.nr_uninterruptible, stats.nr_onhold, stats.nr_forks, stats.load[0], stats.load[1], @@ -607,11 +606,12 @@ pyvserver_enter_namespace(PyObject UNUSED *self, PyObject *args) { xid_t xid; uint_least64_t mask; + uint32_t index; - if (!PyArg_ParseTuple(args, "IK", &xid, &mask)) + if (!PyArg_ParseTuple(args, "IKI", &xid, &mask, &index)) return NULL; - if (vc_enter_namespace(xid, mask) == -1) + if (vc_enter_namespace(xid, mask, index) == -1) return PyErr_SetFromErrno(PyExc_OSError); return NONE(); @@ -622,11 +622,12 @@ pyvserver_set_namespace(PyObject UNUSED *self, PyObject *args) { xid_t xid; uint_least64_t mask; + uint32_t index; - if (!PyArg_ParseTuple(args, "IK", &xid, &mask)) + if (!PyArg_ParseTuple(args, "IKI", &xid, &mask, &index)) return NULL; - if (vc_set_namespace(xid, mask) == -1) + if (vc_set_namespace(xid, mask, index) == -1) return PyErr_SetFromErrno(PyExc_OSError); return NONE(); @@ -1023,7 +1024,7 @@ pyvserver_list2 ## name(PyObject UNUSED *self, PyObject *args) \ char const *str; \ int len; \ struct vc_err_listparser err; \ - list_type val; \ + list_type val = { .mask_member = 0 }; \ \ if (!PyArg_ParseTuple(args, "s#", &str, &len)) \ return NULL; \