From b044091540b88c1b6eedc8bd3e055f380b536ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Fri, 22 Nov 2013 10:00:56 +0100
Subject: [PATCH] Create virDomainEventWatchdog to get rid of the huge union

---
 src/conf/domain_event.c | 60 ++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 562aca3ecd..99d864def7 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -87,10 +87,12 @@ static virClassPtr virObjectEventClass;
 static virClassPtr virDomainEventClass;
 static virClassPtr virDomainEventLifecycleClass;
 static virClassPtr virDomainEventRTCChangeClass;
+static virClassPtr virDomainEventWatchdogClass;
 static void virObjectEventDispose(void *obj);
 static void virDomainEventDispose(void *obj);
 static void virDomainEventLifecycleDispose(void *obj);
 static void virDomainEventRTCChangeDispose(void *obj);
+static void virDomainEventWatchdogDispose(void *obj);
 
 struct _virObjectEvent {
     virObject parent;
@@ -103,9 +105,6 @@ struct _virDomainEvent {
     virObjectMeta meta;
 
     union {
-        struct {
-            int action;
-        } watchdog;
         struct {
             char *srcPath;
             char *devAlias;
@@ -161,6 +160,14 @@ struct _virDomainEventRTCChange {
 typedef struct _virDomainEventRTCChange virDomainEventRTCChange;
 typedef virDomainEventRTCChange *virDomainEventRTCChangePtr;
 
+struct _virDomainEventWatchdog {
+    virDomainEvent parent;
+
+    int action;
+};
+typedef struct _virDomainEventWatchdog virDomainEventWatchdog;
+typedef virDomainEventWatchdog *virDomainEventWatchdogPtr;
+
 static int virObjectEventOnceInit(void)
 {
     if (!(virObjectEventClass =
@@ -187,6 +194,12 @@ static int virObjectEventOnceInit(void)
                       sizeof(virDomainEventRTCChange),
                       virDomainEventRTCChangeDispose)))
         return -1;
+    if (!(virDomainEventWatchdogClass =
+          virClassNew(virDomainEventClass,
+                      "virDomainEventWatchdog",
+                      sizeof(virDomainEventWatchdog),
+                      virDomainEventWatchdogDispose)))
+        return -1;
     return 0;
 }
 
@@ -279,6 +292,12 @@ static void virDomainEventRTCChangeDispose(void *obj)
     VIR_DEBUG("obj=%p", event);
 }
 
+static void virDomainEventWatchdogDispose(void *obj)
+{
+    virDomainEventWatchdogPtr event = obj;
+    VIR_DEBUG("obj=%p", event);
+}
+
 /**
  * virObjectEventCallbackListFree:
  * @list: event callback list head
@@ -912,40 +931,38 @@ virDomainEventPtr virDomainEventRTCChangeNewFromObj(virDomainObjPtr obj,
     return (virDomainEventPtr)ev;
 }
 
-virDomainEventPtr virDomainEventWatchdogNewFromDom(virDomainPtr dom,
-                                                   int action)
+virDomainEventPtr virDomainEventWatchdogNewFromDom(virDomainPtr dom, int action)
 {
-    virDomainEventPtr ev;
+    virDomainEventWatchdogPtr ev;
 
     if (virObjectEventInitialize() < 0)
         return NULL;
 
-    if (!(ev = virDomainEventNew(virDomainEventClass,
+    if (!(ev = virDomainEventNew(virDomainEventWatchdogClass,
                                  VIR_DOMAIN_EVENT_ID_WATCHDOG,
                                  dom->id, dom->name, dom->uuid)))
         return NULL;
 
-    ev->data.watchdog.action = action;
+    ev->action = action;
 
-    return ev;
+    return (virDomainEventPtr)ev;
 }
-virDomainEventPtr virDomainEventWatchdogNewFromObj(virDomainObjPtr obj,
-                                                   int action)
+virDomainEventPtr virDomainEventWatchdogNewFromObj(virDomainObjPtr obj, int action)
 {
-    virDomainEventPtr ev;
+    virDomainEventWatchdogPtr ev;
 
     if (virObjectEventInitialize() < 0)
         return NULL;
 
-    if (!(ev = virDomainEventNew(virDomainEventClass,
+    if (!(ev = virDomainEventNew(virDomainEventWatchdogClass,
                                  VIR_DOMAIN_EVENT_ID_WATCHDOG,
                                  obj->def->id, obj->def->name,
                                  obj->def->uuid)))
         return NULL;
 
-    ev->data.watchdog.action = action;
+    ev->action = action;
 
-    return ev;
+    return (virDomainEventPtr)ev;
 }
 
 static virDomainEventPtr virDomainEventIOErrorNewFromDomImpl(int event,
@@ -1528,10 +1545,15 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn,
         }
 
     case VIR_DOMAIN_EVENT_ID_WATCHDOG:
-        ((virConnectDomainEventWatchdogCallback)cb)(conn, dom,
-                                                    event->data.watchdog.action,
-                                                    cbopaque);
-        goto cleanup;
+        {
+            virDomainEventWatchdogPtr watchdogEvent;
+
+            watchdogEvent = (virDomainEventWatchdogPtr)event;
+            ((virConnectDomainEventWatchdogCallback)cb)(conn, dom,
+                                                        watchdogEvent->action,
+                                                        cbopaque);
+            goto cleanup;
+        }
 
     case VIR_DOMAIN_EVENT_ID_IO_ERROR:
         ((virConnectDomainEventIOErrorCallback)cb)(conn, dom,