From 0f7171da1be3b37613bb284789697888c2aef7bd Mon Sep 17 00:00:00 2001

Message-Id: <0f7171da1be3b37613bb284789697888c2aef7bd@dist-git>

From: Pavel Hrdina <phrdina@redhat.com>

Date: Tue, 30 Sep 2014 19:25:05 +0200

Subject: [PATCH] implement new tunable event

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1147639

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

(cherry picked from commit 714aa155e84c4b55e37b5554c9dbc5e7ddd61cd3)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 examples/event-test.py         |  3 ++

 libvirt-override-virConnect.py |  9 ++++++

 libvirt-override.c             | 64 ++++++++++++++++++++++++++++++++++++++++++

 3 files changed, 76 insertions(+)

diff --git a/examples/event-test.py b/examples/event-test.py

index cd85de3..be7a7d4 100644

--- a/examples/event-test.py

+++ b/examples/event-test.py

@@ -515,6 +515,8 @@ def myDomainEventDeviceRemovedCallback(conn, dom, dev, opaque):

             dom.name(), dom.ID(), dev))

 def myDomainEventBlockJob2Callback(conn, dom, disk, type, status, opaque):

     print("myDomainEventBlockJob2Callback: Domain %s(%s) %s on disk %s %s" % (dom.name(), dom.ID(), blockJobTypeToString(type), disk, blockJobStatusToString(status)))

+def myDomainEventTunableCallback(conn, dom, params, opaque):

+    print("myDomainEventTunableCallback: Domain %s(%s) %s" % (dom.name(), dom.ID(), params))

 ##########################################################################

 # Network events

@@ -624,6 +626,7 @@ def main():

     vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK, myDomainEventPMSuspendDiskCallback, None)

     vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, myDomainEventDeviceRemovedCallback, None)

     vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, myDomainEventBlockJob2Callback, None)

+    vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TUNABLE, myDomainEventTunableCallback, 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 218f266..ffb6d6b 100644

--- a/libvirt-override-virConnect.py

+++ b/libvirt-override-virConnect.py

@@ -188,6 +188,15 @@

         cb(self, virDomain(self, _obj=dom), devAlias, opaque)

         return 0

+    def _dispatchDomainEventTunableCallback(self, dom, params, cbData):

+        """Dispatches event to python user domain tunable event callbacks

+        """

+        cb = cbData["cb"]

+        opaque = cbData["opaque"]

+

+        cb(self, virDomain(self, _obj=dom), params, 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 2dbe339..d94c292 100644

--- a/libvirt-override.c

+++ b/libvirt-override.c

@@ -6506,6 +6506,65 @@ libvirt_virConnectDomainEventDeviceRemovedCallback(virConnectPtr conn ATTRIBUTE_

 }

 #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */

+#if LIBVIR_CHECK_VERSION(1, 2, 9)

+static int

+libvirt_virConnectDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED,

+                                             virDomainPtr dom,

+                                             virTypedParameterPtr params,

+                                             int nparams,

+                                             void *opaque)

+{

+    PyObject *pyobj_cbData = (PyObject*)opaque;

+    PyObject *pyobj_dom;

+    PyObject *pyobj_ret = NULL;

+    PyObject *pyobj_conn;

+    PyObject *dictKey;

+    PyObject *pyobj_dict = NULL;

+    int ret = -1;

+

+    LIBVIRT_ENSURE_THREAD_STATE;

+

+    pyobj_dict = getPyVirTypedParameter(params, nparams);

+    if (!pyobj_dict)

+        goto cleanup;

+

+    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*)"_dispatchDomainEventTunableCallback",

+                                    (char*)"OOO",

+                                    pyobj_dom, pyobj_dict, pyobj_cbData);

+

+    Py_DECREF(pyobj_cbData);

+    Py_DECREF(pyobj_dom);

+

+ cleanup:

+    if (!pyobj_ret) {

+        DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret);

+        PyErr_Print();

+        Py_XDECREF(pyobj_dict);

+    } else {

+        Py_DECREF(pyobj_ret);

+        ret = 0;

+    }

+

+    LIBVIRT_RELEASE_THREAD_STATE;

+    return ret;

+

+}

+#endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */

 static PyObject *

 libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self,

@@ -6594,6 +6653,11 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self,

         cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceRemovedCallback);

         break;

 #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */

+#if LIBVIR_CHECK_VERSION(1, 2, 9)

+    case VIR_DOMAIN_EVENT_ID_TUNABLE:

+        cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventTunableCallback);

+        break;

+#endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */

     case VIR_DOMAIN_EVENT_ID_LAST:

         break;

     }

-- 

2.1.3