From b5c2428444e6e5fd153c6ac11d15edb4b3f0104e Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 23 Jun 2011 11:56:54 -0600 Subject: Revert "Enable virDomainBlockPull in the python API." This reverts commit d74b86f5d6ecae3d18a391f90a918fcac75914db. Conflicts: python/generator.py --- libvirt-override.c | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) (limited to 'libvirt-override.c') diff --git a/libvirt-override.c b/libvirt-override.c index 837c9a6..8be9af7 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2415,57 +2415,6 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(py_retval); } -static PyObject * -libvirt_virDomainBlockPullImpl(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args, int infoOnly) { - virDomainPtr domain; - PyObject *pyobj_domain; - const char *path; - unsigned int flags; - virDomainBlockPullInfo info; - int c_ret; - PyObject *ret; - - if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainStreamDiskInfo", - &pyobj_domain, &path, &flags)) - return(NULL); - domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); - -LIBVIRT_BEGIN_ALLOW_THREADS; - if (infoOnly) - c_ret = virDomainGetBlockPullInfo(domain, path, &info, flags); - else - c_ret = virDomainBlockPull(domain, path, &info, flags); -LIBVIRT_END_ALLOW_THREADS; - - if (c_ret == -1) - return VIR_PY_NONE; - - if ((ret = PyDict_New()) == NULL) - return VIR_PY_NONE; - - PyDict_SetItem(ret, libvirt_constcharPtrWrap("cur"), - libvirt_ulonglongWrap(info.cur)); - PyDict_SetItem(ret, libvirt_constcharPtrWrap("end"), - libvirt_ulonglongWrap(info.end)); - - return ret; -} - -static PyObject * -libvirt_virDomainBlockPull(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) -{ - return libvirt_virDomainBlockPullImpl(self, args, 0); -} - -static PyObject * -libvirt_virDomainGetBlockPullInfo(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) -{ - return libvirt_virDomainBlockPullImpl(self, args, 1); -} - /******************************************* * Helper functions to avoid importing modules @@ -3925,8 +3874,6 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetJobInfo", libvirt_virDomainGetJobInfo, METH_VARARGS, NULL}, {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, {(char *) "virDomainRevertToSnapshot", libvirt_virDomainRevertToSnapshot, METH_VARARGS, NULL}, - {(char *) "virDomainBlockPull", libvirt_virDomainBlockPull, METH_VARARGS, NULL}, - {(char *) "virDomainGetBlockPullInfo", libvirt_virDomainGetBlockPullInfo, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- cgit