This is the python API, again just changed to cope with removal of the
ByCaps API calls
Daniel
diff -r 105e73557ef8 python/generator.py
--- a/python/generator.py Thu Nov 20 16:27:06 2008 +0000
+++ b/python/generator.py Thu Nov 20 16:43:08 2008 +0000
@@ -260,6 +260,11 @@
'const virConnectPtr': ('O', "virConnect", "virConnectPtr", "virConnectPtr"),
'virConnect *': ('O', "virConnect", "virConnectPtr", "virConnectPtr"),
'const virConnect *': ('O', "virConnect", "virConnectPtr", "virConnectPtr"),
+
+ 'virNodeDevicePtr': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr"),
+ 'const virNodeDevicePtr': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr"),
+ 'virNodeDevice *': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr"),
+ 'const virNodeDevice *': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr"),
}
py_return_types = {
@@ -318,6 +323,8 @@
'virDomainBlockPeek',
'virDomainMemoryPeek',
'virEventRegisterImpl',
+ 'virNodeListDevices',
+ 'virNodeDeviceListCaps',
)
@@ -601,6 +608,8 @@
"virStoragePool *": ("._o", "virStoragePool(self, _obj=%s)", "virStoragePool"),
"virStorageVolPtr": ("._o", "virStorageVol(self, _obj=%s)", "virStorageVol"),
"virStorageVol *": ("._o", "virStorageVol(self, _obj=%s)", "virStorageVol"),
+ "virNodeDevicePtr": ("._o", "virNodeDevice(self, _obj=%s)", "virNodeDevice"),
+ "virNodeDevice *": ("._o", "virNodeDevice(self, _obj=%s)", "virNodeDevice"),
"virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"),
"virConnect *": ("._o", "virConnect(_obj=%s)", "virConnect"),
}
@@ -608,7 +617,8 @@
converter_type = {
}
-primary_classes = ["virDomain", "virNetwork", "virStoragePool", "virStorageVol", "virConnect"]
+primary_classes = ["virDomain", "virNetwork", "virStoragePool", "virStorageVol",
+ "virConnect", "virNodeDevice" ]
classes_ancestor = {
}
@@ -617,6 +627,7 @@
"virNetwork": "virNetworkFree",
"virStoragePool": "virStoragePoolFree",
"virStorageVol": "virStorageVolFree",
+ "virNodeDevice" : "virNodeDeviceFree"
}
functions_noexcept = {
@@ -626,6 +637,8 @@
'virStoragePoolGetName': True,
'virStorageVolGetName': True,
'virStorageVolGetkey': True,
+ 'virNodeDeviceGetName': True,
+ 'virNodeDeviceGetParent': True,
}
reference_keepers = {
@@ -706,6 +719,13 @@
elif name[0:13] == "virStorageVol":
func = name[13:]
func = string.lower(func[0:1]) + func[1:]
+ elif name[0:13] == "virNodeDevice":
+ if name[13:16] == "Get":
+ func = string.lower(name[16]) + name[17:]
+ elif name[13:19] == "Lookup" or name[13:] == "Create":
+ func = string.lower(name[3]) + name[4:]
+ else:
+ func = string.lower(name[13]) + name[14:]
elif name[0:7] == "virNode":
func = name[7:]
func = string.lower(func[0:1]) + func[1:]
@@ -958,7 +978,7 @@
else:
txt.write("Class %s()\n" % (classname))
classes.write("class %s:\n" % (classname))
- if classname in [ "virDomain", "virNetwork", "virStoragePool", "virStorageVol" ]:
+ if classname in [ "virDomain", "virNetwork", "virStoragePool", "virStorageVol", "virNodeDevice" ]:
classes.write(" def __init__(self, conn, _obj=None):\n")
else:
classes.write(" def __init__(self, _obj=None):\n")
@@ -966,7 +986,7 @@
list = reference_keepers[classname]
for ref in list:
classes.write(" self.%s = None\n" % ref[1])
- if classname in [ "virDomain", "virNetwork" ]:
+ if classname in [ "virDomain", "virNetwork", "virNodeDevice" ]:
classes.write(" self._conn = conn\n")
elif classname in [ "virStorageVol", "virStoragePool" ]:
classes.write(" self._conn = conn\n" + \
diff -r 105e73557ef8 python/libvir.c
--- a/python/libvir.c Thu Nov 20 16:27:06 2008 +0000
+++ b/python/libvir.c Thu Nov 20 16:43:08 2008 +0000
@@ -1466,6 +1466,90 @@
return(py_retval);
}
+static PyObject *
+libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
+ PyObject *args) {
+ PyObject *py_retval;
+ char **names = NULL;
+ int c_retval, i;
+ virConnectPtr conn;
+ PyObject *pyobj_conn;
+ char *cap;
+ unsigned int flags;
+
+ if (!PyArg_ParseTuple(args, (char *)"Ozi:virNodeListDevices",
+ &pyobj_conn, &cap, &flags))
+ return(NULL);
+ conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
+
+ c_retval = virNodeNumOfDevices(conn, cap, flags);
+ if (c_retval < 0)
+ return VIR_PY_NONE;
+
+ if (c_retval) {
+ names = malloc(sizeof(*names) * c_retval);
+ if (!names)
+ return VIR_PY_NONE;
+ c_retval = virNodeListDevices(conn, cap, names, c_retval, flags);
+ if (c_retval < 0) {
+ free(names);
+ return VIR_PY_NONE;
+ }
+ }
+ py_retval = PyList_New(c_retval);
+
+ if (names) {
+ for (i = 0;i < c_retval;i++) {
+ PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
+ free(names[i]);
+ }
+ free(names);
+ }
+
+ return(py_retval);
+}
+
+static PyObject *
+libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
+ PyObject *args) {
+ PyObject *py_retval;
+ char **names = NULL;
+ int c_retval, i;
+ virNodeDevicePtr dev;
+ PyObject *pyobj_dev;
+
+ if (!PyArg_ParseTuple(args, (char *)"O:virNodeDeviceListCaps", &pyobj_dev))
+ return(NULL);
+ dev = (virNodeDevicePtr) PyvirNodeDevice_Get(pyobj_dev);
+
+ c_retval = virNodeDeviceNumOfCaps(dev);
+ if (c_retval < 0)
+ return VIR_PY_NONE;
+
+ if (c_retval) {
+ names = malloc(sizeof(*names) * c_retval);
+ if (!names)
+ return VIR_PY_NONE;
+ c_retval = virNodeDeviceListCaps(dev, names, c_retval);
+ if (c_retval < 0) {
+ free(names);
+ return VIR_PY_NONE;
+ }
+ }
+ py_retval = PyList_New(c_retval);
+
+ if (names) {
+ for (i = 0;i < c_retval;i++) {
+ PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
+ free(names[i]);
+ }
+ free(names);
+ }
+
+ return(py_retval);
+}
+
+
/*******************************************
* Helper functions to avoid importing modules
* for every callback
@@ -2044,6 +2128,8 @@
{(char *) "virEventRegisterImpl", libvirt_virEventRegisterImpl, METH_VARARGS, NULL},
{(char *) "virEventInvokeHandleCallback", libvirt_virEventInvokeHandleCallback, METH_VARARGS, NULL},
{(char *) "virEventInvokeTimeoutCallback", libvirt_virEventInvokeTimeoutCallback, METH_VARARGS, NULL},
+ {(char *) "virNodeListDevices", libvirt_virNodeListDevices, METH_VARARGS, NULL},
+ {(char *) "virNodeDeviceListCaps", libvirt_virNodeDeviceListCaps, METH_VARARGS, NULL},
{NULL, NULL, 0, NULL}
};
diff -r 105e73557ef8 python/libvirt-python-api.xml
--- a/python/libvirt-python-api.xml Thu Nov 20 16:27:06 2008 +0000
+++ b/python/libvirt-python-api.xml Thu Nov 20 16:43:08 2008 +0000
@@ -160,5 +160,17 @@
<return type='int *' info='the list of information or None in case of error'/>
<arg name='vol' type='virStorageVolPtr' info='a storage vol object'/>
</function>
+ <function name='virNodeListDevices' file='python'>
+ <info>list the node devices</info>
+ <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
+ <arg name='cap' type='const unsigned char *' info='capability name'/>
+ <arg name='flags' type='unsigned int' info='flags (unused; pass 0)'/>
+ <return type='str *' info='the list of Names or None in case of error'/>
+ </function>
+ <function name='virNodeDeviceListCaps' file='python'>
+ <info>list the node device's capabilities</info>
+ <arg name='dev' type='virNodeDevicePtr' info='pointer to the node device'/>
+ <return type='str *' info='the list of Names or None in case of error'/>
+ </function>
</symbols>
</api>
diff -r 105e73557ef8 python/libvirt_wrap.h
--- a/python/libvirt_wrap.h Thu Nov 20 16:27:06 2008 +0000
+++ b/python/libvirt_wrap.h Thu Nov 20 16:43:08 2008 +0000
@@ -65,6 +65,16 @@
virStorageVolPtr obj;
} PyvirStorageVol_Object;
+
+#define PyvirNodeDevice_Get(v) (((v) == Py_None) ? NULL : \
+ (((PyvirNodeDevice_Object *)(v))->obj))
+
+typedef struct {
+ PyObject_HEAD
+ virNodeDevicePtr obj;
+} PyvirNodeDevice_Object;
+
+
#define PyvirEventHandleCallback_Get(v) (((v) == Py_None) ? NULL : \
(((PyvirEventHandleCallback_Object *)(v))->obj))
@@ -89,6 +99,7 @@
void* obj;
} PyvirVoidPtr_Object;
+
PyObject * libvirt_intWrap(int val);
PyObject * libvirt_longWrap(long val);
PyObject * libvirt_ulongWrap(unsigned long val);
@@ -105,6 +116,8 @@
PyObject * libvirt_virEventTimeoutCallbackWrap(virEventTimeoutCallback node);
PyObject * libvirt_virFreeCallbackWrap(virFreeCallback node);
PyObject * libvirt_virVoidPtrWrap(void* node);
+PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node);
+
/* Provide simple macro statement wrappers (adapted from GLib, in turn from Perl):
* LIBVIRT_STMT_START { statements; } LIBVIRT_STMT_END;
diff -r 105e73557ef8 python/types.c
--- a/python/types.c Thu Nov 20 16:27:06 2008 +0000
+++ b/python/types.c Thu Nov 20 16:43:08 2008 +0000
@@ -164,6 +164,21 @@
}
PyObject *
+libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node)
+{
+ PyObject *ret;
+
+ if (node == NULL) {
+ Py_INCREF(Py_None);
+ return (Py_None);
+ }
+ ret =
+ PyCObject_FromVoidPtrAndDesc((void *) node, (char *) "virNodeDevicePtr",
+ NULL);
+ return (ret);
+}
+
+PyObject *
libvirt_virEventHandleCallbackWrap(virEventHandleCallback node)
{
PyObject *ret;
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list