diff options
author | Eric Blake <eblake@redhat.com> | 2011-06-23 11:54:19 -0600 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2011-06-24 08:41:24 -0600 |
commit | e835299a2d9a32f175001186706a334806792ace (patch) | |
tree | 591898839440303825bd328d46cb2acb40a8ce41 /libvirt-override.c | |
parent | 18c359e2f9d5b575e72a5b785364c95c9daa648a (diff) | |
download | libvirt-python-e835299a2d9a32f175001186706a334806792ace.tar.gz |
Revert "Asynchronous event for BlockPull completion"
This reverts commit 12cd77a0c58a80179182f7d09e8e73f9f66b4677.
Conflicts:
python/libvirt-override-virConnect.py
python/libvirt-override.c
src/remote/remote_protocol.x
Diffstat (limited to 'libvirt-override.c')
-rw-r--r-- | libvirt-override.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/libvirt-override.c b/libvirt-override.c index e7426a5..837c9a6 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -3597,54 +3597,6 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE return ret; } -static int -libvirt_virConnectDomainEventBlockPullCallback(virConnectPtr conn ATTRIBUTE_UNUSED, - virDomainPtr dom, - const char *path, - int status, - void *opaque) -{ - PyObject *pyobj_cbData = (PyObject*)opaque; - PyObject *pyobj_dom; - PyObject *pyobj_ret; - PyObject *pyobj_conn; - PyObject *dictKey; - int ret = -1; - - LIBVIRT_ENSURE_THREAD_STATE; - - /* Create a python instance of this virDomainPtr */ - virDomainRef(dom); - pyobj_dom = libvirt_virDomainPtrWrap(dom); - Py_INCREF(pyobj_cbData); - - dictKey = libvirt_constcharPtrWrap("conn"); - pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); - Py_DECREF(dictKey); - - /* Call the Callback Dispatcher */ - pyobj_ret = PyObject_CallMethod(pyobj_conn, - (char*)"_dispatchDomainEventBlockPullCallback", - (char*)"OsiO", - pyobj_dom, path, status, pyobj_cbData); - - Py_DECREF(pyobj_cbData); - Py_DECREF(pyobj_dom); - - if(!pyobj_ret) { -#if DEBUG_ERROR - printf("%s - ret:%p\n", __FUNCTION__, pyobj_ret); -#endif - PyErr_Print(); - } else { - Py_DECREF(pyobj_ret); - ret = 0; - } - - LIBVIRT_RELEASE_THREAD_STATE; - return ret; -} - static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) @@ -3699,9 +3651,6 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, case VIR_DOMAIN_EVENT_ID_CONTROL_ERROR: cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventGenericCallback); break; - case VIR_DOMAIN_EVENT_ID_BLOCK_PULL: - cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventBlockPullCallback); - break; } if (!cb) { |