mirror of
https://gitlab.com/libvirt/libvirt-python.git
synced 2025-07-17 00:59:36 +03:00
6798609a5e
This fixes regression caused by the 1d39dbaf63
fdlist[i] erroneously was replaced by fdlist[1] which caused
lxcOpenNamespace to return a list with identical elements.
Signed-off-by: Sergei Turchanov <turchanov@farpost.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
166 lines
3.8 KiB
C
166 lines
3.8 KiB
C
/*
|
|
* libvir.c: this modules implements the main part of the glue of the
|
|
* libvir library and the Python interpreter. It provides the
|
|
* entry points where an automatically generated stub is
|
|
* unpractical
|
|
*
|
|
* Copyright (C) 2012-2013 Red Hat, Inc.
|
|
*
|
|
* Daniel Veillard <veillard@redhat.com>
|
|
*/
|
|
|
|
/* Horrible kludge to work around even more horrible name-space pollution
|
|
via Python.h. That file includes /usr/include/python2.5/pyconfig*.h,
|
|
which has over 180 autoconf-style HAVE_* definitions. Shame on them. */
|
|
#undef HAVE_PTHREAD_H
|
|
|
|
#include <Python.h>
|
|
#include <libvirt/libvirt-lxc.h>
|
|
#include <libvirt/virterror.h>
|
|
#include "typewrappers.h"
|
|
#include "libvirt-utils.h"
|
|
#include "build/libvirt-lxc.h"
|
|
|
|
#if PY_MAJOR_VERSION > 2
|
|
# ifndef __CYGWIN__
|
|
extern PyObject *PyInit_libvirtmod_lxc(void);
|
|
# else
|
|
extern PyObject *PyInit_cygvirtmod_lxc(void);
|
|
# endif
|
|
#else
|
|
# ifndef __CYGWIN__
|
|
extern void initlibvirtmod_lxc(void);
|
|
# else
|
|
extern void initcygvirtmod_lxc(void);
|
|
# endif
|
|
#endif
|
|
|
|
#if 0
|
|
# define DEBUG_ERROR 1
|
|
#endif
|
|
|
|
#if DEBUG_ERROR
|
|
# define DEBUG(fmt, ...) \
|
|
printf(fmt, __VA_ARGS__)
|
|
#else
|
|
# define DEBUG(fmt, ...) \
|
|
do {} while (0)
|
|
#endif
|
|
|
|
/************************************************************************
|
|
* *
|
|
* Statistics *
|
|
* *
|
|
************************************************************************/
|
|
|
|
static PyObject *
|
|
libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED,
|
|
PyObject *args)
|
|
{
|
|
PyObject *py_retval;
|
|
virDomainPtr domain;
|
|
PyObject *pyobj_domain;
|
|
unsigned int flags;
|
|
int c_retval;
|
|
int *fdlist = NULL;
|
|
ssize_t i;
|
|
|
|
if (!PyArg_ParseTuple(args, (char *)"OI:virDomainLxcOpenNamespace",
|
|
&pyobj_domain, &flags))
|
|
return NULL;
|
|
domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
|
|
|
|
if (domain == NULL)
|
|
return VIR_PY_NONE;
|
|
LIBVIRT_BEGIN_ALLOW_THREADS;
|
|
c_retval = virDomainLxcOpenNamespace(domain, &fdlist, flags);
|
|
LIBVIRT_END_ALLOW_THREADS;
|
|
|
|
if (c_retval < 0)
|
|
return VIR_PY_NONE;
|
|
|
|
if ((py_retval = PyList_New(0)) == NULL)
|
|
goto error;
|
|
|
|
for (i = 0; i < c_retval; i++)
|
|
VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[i]), error);
|
|
|
|
cleanup:
|
|
VIR_FREE(fdlist);
|
|
return py_retval;
|
|
|
|
error:
|
|
for (i = 0; i < c_retval; i++) {
|
|
VIR_FORCE_CLOSE(fdlist[i]);
|
|
}
|
|
Py_CLEAR(py_retval);
|
|
goto cleanup;
|
|
}
|
|
/************************************************************************
|
|
* *
|
|
* The registration stuff *
|
|
* *
|
|
************************************************************************/
|
|
static PyMethodDef libvirtLxcMethods[] = {
|
|
#include "build/libvirt-lxc-export.c"
|
|
{(char *) "virDomainLxcOpenNamespace", libvirt_lxc_virDomainLxcOpenNamespace, METH_VARARGS, NULL},
|
|
{NULL, NULL, 0, NULL}
|
|
};
|
|
|
|
#if PY_MAJOR_VERSION > 2
|
|
static struct PyModuleDef moduledef = {
|
|
PyModuleDef_HEAD_INIT,
|
|
# ifndef __CYGWIN__
|
|
"libvirtmod_lxc",
|
|
# else
|
|
"cygvirtmod_lxc",
|
|
# endif
|
|
NULL,
|
|
-1,
|
|
libvirtLxcMethods,
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
PyObject *
|
|
# ifndef __CYGWIN__
|
|
PyInit_libvirtmod_lxc
|
|
# else
|
|
PyInit_cygvirtmod_lxc
|
|
# endif
|
|
(void)
|
|
{
|
|
PyObject *module;
|
|
|
|
if (virInitialize() < 0)
|
|
return NULL;
|
|
|
|
module = PyModule_Create(&moduledef);
|
|
|
|
return module;
|
|
}
|
|
#else /* ! PY_MAJOR_VERSION > 2 */
|
|
void
|
|
# ifndef __CYGWIN__
|
|
initlibvirtmod_lxc
|
|
# else
|
|
initcygvirtmod_lxc
|
|
# endif
|
|
(void)
|
|
{
|
|
if (virInitialize() < 0)
|
|
return;
|
|
|
|
/* initialize the python extension module */
|
|
Py_InitModule((char *)
|
|
# ifndef __CYGWIN__
|
|
"libvirtmod_lxc",
|
|
# else
|
|
"cygvirtmod_lxc",
|
|
# endif
|
|
libvirtLxcMethods);
|
|
}
|
|
#endif /* ! PY_MAJOR_VERSION > 2 */
|