8:53 a.m.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
examples/event-test.py | 4 +++
libvirt-override-virConnect.py | 9 +++++++
libvirt-override.c | 57 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/examples/event-test.py b/examples/event-test.py
index 2c6ce7b..615f86c 100755
--- a/examples/event-test.py
+++ b/examples/event-test.py
@@ -530,6 +530,9 @@ def myDomainEventAgentLifecycleCallback(conn, dom, state, reason,
opaque):
def myDomainEventDeviceAddedCallback(conn, dom, dev, opaque):
print("myDomainEventDeviceAddedCallback: Domain %s(%s) device added: %s" %
(
dom.name(), dom.ID(), dev))
+def myDomainEventMigrationIteration(conn, dom, iteration, opaque):
+ print("myDomainEventMigrationIteration: Domain %s(%s) started migration
iteration %d" % (
+ dom.name(), dom.ID(), iteration))
##########################################################################
# Network events
@@ -642,6 +645,7 @@ def main():
vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TUNABLE,
myDomainEventTunableCallback, None)
vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE,
myDomainEventAgentLifecycleCallback, None)
vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED,
myDomainEventDeviceAddedCallback, None)
+ vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION,
myDomainEventMigrationIteration, None)
vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE,
myNetworkEventLifecycleCallback, None)
diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py
index 821be87..4231195 100644
--- a/libvirt-override-virConnect.py
+++ b/libvirt-override-virConnect.py
@@ -216,6 +216,15 @@
cb(self, virDomain(self, _obj=dom), devAlias, opaque)
return 0
+ def _dispatchDomainEventMigrationIterationCallback(self, dom, iteration, cbData):
+ """Dispatches event to python user domain migration iteration
event callbacks
+ """
+ cb = cbData["cb"]
+ opaque = cbData["opaque"]
+
+ cb(self, virDomain(self, _obj=dom), iteration, opaque)
+ return 0
+
def domainEventDeregisterAny(self, callbackID):
"""Removes a Domain Event Callback. De-registering for a
domain callback will disable delivery of this event type """
diff --git a/libvirt-override.c b/libvirt-override.c
index 5f1c98f..a8c019b 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -6783,6 +6783,58 @@ libvirt_virConnectDomainEventDeviceAddedCallback(virConnectPtr conn
ATTRIBUTE_UN
}
#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */
+#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION
+static int
+libvirt_virConnectDomainEventMigrationIterationCallback(virConnectPtr conn
ATTRIBUTE_UNUSED,
+ virDomainPtr dom,
+ int iteration,
+ void *opaque)
+{
+ PyObject *pyobj_cbData = (PyObject*)opaque;
+ PyObject *pyobj_dom;
+ PyObject *pyobj_ret = NULL;
+ PyObject *pyobj_conn;
+ PyObject *dictKey;
+ int ret = -1;
+
+ LIBVIRT_ENSURE_THREAD_STATE;
+
+ if (!(dictKey = libvirt_constcharPtrWrap("conn")))
+ goto cleanup;
+ pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey);
+ Py_DECREF(dictKey);
+
+ /* Create a python instance of this virDomainPtr */
+ virDomainRef(dom);
+ if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) {
+ virDomainFree(dom);
+ goto cleanup;
+ }
+ Py_INCREF(pyobj_cbData);
+
+ /* Call the Callback Dispatcher */
+ pyobj_ret = PyObject_CallMethod(pyobj_conn,
+
(char*)"_dispatchDomainEventMigrationIterationCallback",
+ (char*)"OiO",
+ pyobj_dom, iteration, pyobj_cbData);
+
+ Py_DECREF(pyobj_cbData);
+ Py_DECREF(pyobj_dom);
+
+ cleanup:
+ if (!pyobj_ret) {
+ DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret);
+ PyErr_Print();
+ } else {
+ Py_DECREF(pyobj_ret);
+ ret = 0;
+ }
+
+ LIBVIRT_RELEASE_THREAD_STATE;
+ return ret;
+}
+#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */
+
static PyObject *
libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED,
PyObject *args)
@@ -6883,6 +6935,11 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self
ATTRIBUTE_UNUSED,
cb =
VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceAddedCallback);
break;
#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */
+#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION
+ case VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION:
+ cb =
VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventMigrationIterationCallback);
+ break;
+#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */
case VIR_DOMAIN_EVENT_ID_LAST:
break;
}
--
2.7.0