NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Enable virDomainBlockPull in the python API."

Browse Source 
This reverts commit d74b86f5d6.

Conflicts:

	python/generator.py
This commit is contained in:
Eric Blake 2011-06-23 11:56:54 -06:00
parent c4c59e7228
commit 21ecea2e93
3 changed files with 3 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/generator.py
View File

@ -184,6 +184,8 @@ def enum(type, name, value):
functions_failed = [] functions_failed = []
functions_skipped = [ functions_skipped = [
"virConnectListDomains", "virConnectListDomains",
'virDomainBlockPull',
'virDomainGetBlockPullInfo',
] ]
skipped_modules = { skipped_modules = {
@ -200,6 +202,7 @@ skipped_types = {
'virStreamEventCallback': "No function types in python", 'virStreamEventCallback': "No function types in python",
'virEventHandleCallback': "No function types in python", 'virEventHandleCallback': "No function types in python",
'virEventTimeoutCallback': "No function types in python", 'virEventTimeoutCallback': "No function types in python",
'virDomainBlockPullInfoPtr': "Not implemented yet",
} }
####################################################################### #######################################################################
@ -366,8 +369,6 @@ skip_impl = (
'virDomainSendKey', 'virDomainSendKey',
'virNodeGetCPUStats', 'virNodeGetCPUStats',
'virNodeGetMemoryStats', 'virNodeGetMemoryStats',
'virDomainBlockPull',
'virDomainGetBlockPullInfo',
) )

14
python/libvirt-override-api.xml
View File

@ -320,19 +320,5 @@
<arg name='flags' type='unsigned int' info='flags, curently unused'/> <arg name='flags' type='unsigned int' info='flags, curently unused'/>
<return type='int' info="0 on success, -1 on error"/> <return type='int' info="0 on success, -1 on error"/>
</function> </function>
<function name='virDomainBlockPull' file='python'>
<info>Initiate an incremental BlockPull for the given disk</info>
<arg name='dom' type='virDomainPtr' info='pointer to the domain'/>
<arg name='path' type='const char *' info='Fully-qualified filename of disk'/>
<arg name='flags' type='unsigned int' info='fine-tuning flags, currently unused, pass 0.'/>
<return type='virDomainBlockPullInfo' info='A dictionary containing progress information.' />
</function>
<function name='virDomainGetBlockPullInfo' file='python'>
<info>Get progress information for a background BlockPull operation</info>
<arg name='dom' type='virDomainPtr' info='pointer to the domain'/>
<arg name='path' type='const char *' info='Fully-qualified filename of disk'/>
<arg name='flags' type='unsigned int' info='fine-tuning flags, currently unused, pass 0.'/>
<return type='virDomainBlockPullInfo' info='A dictionary containing progress information.' />
</function>
</symbols> </symbols>
</api> </api>

53
python/libvirt-override.c
View File

@ -2415,57 +2415,6 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return(py_retval); 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 * Helper functions to avoid importing modules
@ -3925,8 +3874,6 @@ static PyMethodDef libvirtMethods[] = {
{(char *) "virDomainGetJobInfo", libvirt_virDomainGetJobInfo, METH_VARARGS, NULL}, {(char *) "virDomainGetJobInfo", libvirt_virDomainGetJobInfo, METH_VARARGS, NULL},
{(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL},
{(char *) "virDomainRevertToSnapshot", libvirt_virDomainRevertToSnapshot, 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} {NULL, NULL, 0, NULL}
}; };