9:18 a.m.
for consistency with other functions
---
src/conf/domain_event.c | 43 +++++++++++++++++--------------------------
src/conf/domain_event.h | 22 +++++++++++-----------
2 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 4bd81d9..7694fcc 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -979,7 +979,7 @@ void *virDomainEventLifecycleNewFromDef(virDomainDefPtr def, int type,
int detai
type, detail);
}
-virDomainEventPtr virDomainEventRebootNew(int id, const char *name,
+void *virDomainEventRebootNew(int id, const char *name,
const unsigned char *uuid)
{
if (virObjectEventInitialize() < 0)
@@ -990,7 +990,7 @@ virDomainEventPtr virDomainEventRebootNew(int id, const char *name,
id, name, uuid);
}
-virDomainEventPtr virDomainEventRebootNewFromDom(virDomainPtr dom)
+void *virDomainEventRebootNewFromDom(virDomainPtr dom)
{
if (virObjectEventInitialize() < 0)
return NULL;
@@ -1000,7 +1000,7 @@ virDomainEventPtr virDomainEventRebootNewFromDom(virDomainPtr dom)
dom->id, dom->name, dom->uuid);
}
-virDomainEventPtr virDomainEventRebootNewFromObj(virDomainObjPtr obj)
+void *virDomainEventRebootNewFromObj(virDomainObjPtr obj)
{
if (virObjectEventInitialize() < 0)
return NULL;
@@ -1279,7 +1279,7 @@ void *virDomainEventBlockJobNewFromDom(virDomainPtr dom,
path, type, status);
}
-virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom)
+void *virDomainEventControlErrorNewFromDom(virDomainPtr dom)
{
virDomainEventPtr ev;
@@ -1294,7 +1294,7 @@ virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr
dom)
}
-virDomainEventPtr virDomainEventControlErrorNewFromObj(virDomainObjPtr obj)
+void *virDomainEventControlErrorNewFromObj(virDomainObjPtr obj)
{
virDomainEventPtr ev;
@@ -1413,9 +1413,8 @@ void *virDomainEventTrayChangeNewFromDom(virDomainPtr dom,
devAlias, reason);
}
-static virDomainEventPtr
-virDomainEventPMWakeupNew(int id, const char *name,
- unsigned char *uuid)
+static void *virDomainEventPMWakeupNew(int id, const char *name,
+ unsigned char *uuid)
{
virDomainEventPtr ev;
@@ -1430,23 +1429,20 @@ virDomainEventPMWakeupNew(int id, const char *name,
return ev;
}
-virDomainEventPtr
-virDomainEventPMWakeupNewFromObj(virDomainObjPtr obj)
+void *virDomainEventPMWakeupNewFromObj(virDomainObjPtr obj)
{
return virDomainEventPMWakeupNew(obj->def->id,
obj->def->name,
obj->def->uuid);
}
-virDomainEventPtr
-virDomainEventPMWakeupNewFromDom(virDomainPtr dom)
+void *virDomainEventPMWakeupNewFromDom(virDomainPtr dom)
{
return virDomainEventPMWakeupNew(dom->id, dom->name, dom->uuid);
}
-static virDomainEventPtr
-virDomainEventPMSuspendNew(int id, const char *name,
- unsigned char *uuid)
+static void *virDomainEventPMSuspendNew(int id, const char *name,
+ unsigned char *uuid)
{
virDomainEventPtr ev;
@@ -1461,23 +1457,20 @@ virDomainEventPMSuspendNew(int id, const char *name,
return ev;
}
-virDomainEventPtr
-virDomainEventPMSuspendNewFromObj(virDomainObjPtr obj)
+void *virDomainEventPMSuspendNewFromObj(virDomainObjPtr obj)
{
return virDomainEventPMSuspendNew(obj->def->id,
obj->def->name,
obj->def->uuid);
}
-virDomainEventPtr
-virDomainEventPMSuspendNewFromDom(virDomainPtr dom)
+void *virDomainEventPMSuspendNewFromDom(virDomainPtr dom)
{
return virDomainEventPMSuspendNew(dom->id, dom->name, dom->uuid);
}
-static virDomainEventPtr
-virDomainEventPMSuspendDiskNew(int id, const char *name,
- unsigned char *uuid)
+static void *virDomainEventPMSuspendDiskNew(int id, const char *name,
+ unsigned char *uuid)
{
virDomainEventPtr ev;
@@ -1491,16 +1484,14 @@ virDomainEventPMSuspendDiskNew(int id, const char *name,
return ev;
}
-virDomainEventPtr
-virDomainEventPMSuspendDiskNewFromObj(virDomainObjPtr obj)
+void *virDomainEventPMSuspendDiskNewFromObj(virDomainObjPtr obj)
{
return virDomainEventPMSuspendDiskNew(obj->def->id,
obj->def->name,
obj->def->uuid);
}
-virDomainEventPtr
-virDomainEventPMSuspendDiskNewFromDom(virDomainPtr dom)
+void *virDomainEventPMSuspendDiskNewFromDom(virDomainPtr dom)
{
return virDomainEventPMSuspendDiskNew(dom->id, dom->name, dom->uuid);
}
diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h
index f13c716..06443a0 100644
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -65,9 +65,9 @@ void *virDomainEventLifecycleNewFromDef(virDomainDefPtr def,
int type,
int detail);
-virDomainEventPtr virDomainEventRebootNew(int id, const char *name, const unsigned char
*uuid);
-virDomainEventPtr virDomainEventRebootNewFromDom(virDomainPtr dom);
-virDomainEventPtr virDomainEventRebootNewFromObj(virDomainObjPtr obj);
+void *virDomainEventRebootNew(int id, const char *name, const unsigned char *uuid);
+void *virDomainEventRebootNewFromDom(virDomainPtr dom);
+void *virDomainEventRebootNewFromObj(virDomainObjPtr obj);
void *virDomainEventRTCChangeNewFromDom(virDomainPtr dom, long long offset);
void *virDomainEventRTCChangeNewFromObj(virDomainObjPtr obj, long long offset);
@@ -106,8 +106,8 @@ void *virDomainEventGraphicsNewFromObj(virDomainObjPtr obj,
virDomainEventGraphicsAddressPtr remote,
const char *authScheme,
virDomainEventGraphicsSubjectPtr subject);
-virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom);
-virDomainEventPtr virDomainEventControlErrorNewFromObj(virDomainObjPtr obj);
+void *virDomainEventControlErrorNewFromDom(virDomainPtr dom);
+void *virDomainEventControlErrorNewFromObj(virDomainObjPtr obj);
void *virDomainEventBlockJobNewFromObj(virDomainObjPtr obj,
const char *path,
@@ -134,16 +134,16 @@ void *virDomainEventTrayChangeNewFromObj(virDomainObjPtr obj,
void *virDomainEventTrayChangeNewFromDom(virDomainPtr dom,
const char *devAlias,
int reason);
-virDomainEventPtr virDomainEventPMWakeupNewFromObj(virDomainObjPtr obj);
-virDomainEventPtr virDomainEventPMWakeupNewFromDom(virDomainPtr dom);
-virDomainEventPtr virDomainEventPMSuspendNewFromObj(virDomainObjPtr obj);
-virDomainEventPtr virDomainEventPMSuspendNewFromDom(virDomainPtr dom);
+void *virDomainEventPMWakeupNewFromObj(virDomainObjPtr obj);
+void *virDomainEventPMWakeupNewFromDom(virDomainPtr dom);
+void *virDomainEventPMSuspendNewFromObj(virDomainObjPtr obj);
+void *virDomainEventPMSuspendNewFromDom(virDomainPtr dom);
void *virDomainEventBalloonChangeNewFromDom(virDomainPtr dom, unsigned long long
actual);
void *virDomainEventBalloonChangeNewFromObj(virDomainObjPtr obj, unsigned long long
actual);
-virDomainEventPtr virDomainEventPMSuspendDiskNewFromObj(virDomainObjPtr obj);
-virDomainEventPtr virDomainEventPMSuspendDiskNewFromDom(virDomainPtr dom);
+void *virDomainEventPMSuspendDiskNewFromObj(virDomainObjPtr obj);
+void *virDomainEventPMSuspendDiskNewFromDom(virDomainPtr dom);
void *virDomainEventDeviceRemovedNewFromObj(virDomainObjPtr obj,
const char *devAlias);
--
1.8.4.2