More event callback fixes

In a couple of cases typos meant we were firing the wrong type
of event. In the python code my previous commit accidentally
missed some chunks of the code.

* python/libvirt-override-virConnect.py: Add missing python glue
  accidentally left out of previous commit
* src/conf/domain_event.c, src/qemu/qemu_monitor_json.c: Fix typos
  in event name / method name to invoke

diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py
index 444a499aaf5268fbb03ce23e40ce2f105d10aa55..cb38e3fae39e4cfe47a4aa676466c2927521e7af 100644 (file)
--- a/python/libvirt-override-virConnect.py
+++ b/python/libvirt-override-virConnect.py
@@ -43,7 +43,7 @@
             pass
 
     def dispatchDomainEventLifecycleCallback(self, dom, event, detail, cbData):
-        """Dispatches events to python user domain event callbacks
+        """Dispatches events to python user domain lifecycle event callbacks
         """
         cb = cbData["cb"]
         opaque = cbData["opaque"]
@@ -52,7 +52,7 @@
         return 0
 
     def dispatchDomainEventGenericCallback(self, dom, cbData):
-        """Dispatches events to python user domain event callbacks
+        """Dispatches events to python user domain generic event callbacks
         """
         try:
             cb = cbData["cb"]
@@ -63,6 +63,54 @@
         except AttributeError:
             pass
 
+    def dispatchDomainEventRTCChangeCallback(self, dom, offset, cbData):
+        """Dispatches events to python user domain RTC change event callbacks
+        """
+        try:
+            cb = cbData["cb"]
+            opaque = cbData["opaque"]
+
+            cb(self, virDomain(self, _obj=dom), offset ,opaque)
+            return 0
+        except AttributeError:
+            pass
+
+    def dispatchDomainEventWatchdogCallback(self, dom, action, cbData):
+        """Dispatches events to python user domain watchdog event callbacks
+        """
+        try:
+            cb = cbData["cb"]
+            opaque = cbData["opaque"]
+
+            cb(self, virDomain(self, _obj=dom), action, opaque)
+            return 0
+        except AttributeError:
+            pass
+
+    def dispatchDomainEventIOErrorCallback(self, dom, srcPath, devAlias, action, cbData):
+        """Dispatches events to python user domain IO error event callbacks
+        """
+        try:
+            cb = cbData["cb"]
+            opaque = cbData["opaque"]
+
+            cb(self, virDomain(self, _obj=dom), opaque)
+            return 0
+        except AttributeError:
+            pass
+
+    def dispatchDomainEventGraphicsCallback(self, dom, phase, localAddr, remoteAddr, authScheme, subject, cbData):
+        """Dispatches events to python user domain graphics event callbacks
+        """
+        try:
+            cb = cbData["cb"]
+            opaque = cbData["opaque"]
+
+            cb(self, virDomain(self, _obj=dom), phase, localAddr, remoteAddr, authScheme, subject, opaque)
+            return 0
+        except AttributeError:
+            pass
+
     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/src/conf/domain_event.c b/src/conf/domain_event.c
index 07d6a55f37d51841e56872c3aafa41b9677ce6fa..e3ce5ba156da93e525090baf85630d03f62c9655 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -660,7 +660,7 @@ virDomainEventPtr virDomainEventIOErrorNewFromObj(virDomainObjPtr obj,
                                   obj->def->id, obj->def->name, obj->def->uuid);
 
     if (ev) {
-        ev->data.watchdog.action = action;
+        ev->data.ioError.action = action;
         if (!(ev->data.ioError.srcPath = strdup(srcPath)) ||
             !(ev->data.ioError.devAlias = strdup(devAlias))) {
             virDomainEventFree(ev);

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 1b0ecdfebefb7ad1ab1a87b8d9fea65ba40e8662..29042017ba776fceee125fc8290322bb00217e6d 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -536,7 +536,7 @@ static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr da
     } else {
             actionID = VIR_DOMAIN_EVENT_WATCHDOG_NONE;
     }
-    qemuMonitorEmitRTCChange(mon, actionID);
+    qemuMonitorEmitWatchdog(mon, actionID);
 }
 
 VIR_ENUM_DECL(qemuMonitorIOErrorAction)