External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create virDomainEventLifecycle to start removing the huge union

Browse Source
This commit is contained in:
Cédric Bosdonnat 2013-11-21 17:48:41 +01:00 committed by Daniel P. Berrange
parent de463feb97
commit 0d1d632d79
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/conf/domain_event.c
View File

@ -85,8 +85,10 @@ struct _virObjectEventCallback {
static virClassPtr virObjectEventClass;
static virClassPtr virDomainEventClass;
static virClassPtr virDomainEventLifecycleClass;
static void virObjectEventDispose(void *obj);
static void virDomainEventDispose(void *obj);
static void virDomainEventLifecycleDispose(void *obj);
struct _virObjectEvent {
virObject parent;
@ -99,10 +101,6 @@ struct _virDomainEvent {
virObjectMeta meta;
union {
struct {
int type;
int detail;
} lifecycle;
struct {
long long offset;
} rtcChange;
@ -147,6 +145,16 @@ struct _virDomainEvent {
} data;
};
struct _virDomainEventLifecycle {
virDomainEvent parent;
int type;
int detail;
};
typedef struct _virDomainEventLifecycle virDomainEventLifecycle;
typedef virDomainEventLifecycle *virDomainEventLifecyclePtr;
static int virObjectEventOnceInit(void)
{
if (!(virObjectEventClass =
@ -161,6 +169,12 @@ static int virObjectEventOnceInit(void)
sizeof(virDomainEvent),
virDomainEventDispose)))
return -1;
if (!(virDomainEventLifecycleClass =
virClassNew(virDomainEventClass,
"virDomainEventLifecycle",
sizeof(virDomainEventLifecycle),
virDomainEventLifecycleDispose)))
return -1;
return 0;
}
@ -241,6 +255,12 @@ static void virDomainEventDispose(void *obj)
VIR_FREE(event->meta.name);
}
static void virDomainEventLifecycleDispose(void *obj)
{
virDomainEventLifecyclePtr event = obj;
VIR_DEBUG("obj=%p", event);
}
/**
* virObjectEventCallbackListFree:
* @list: event callback list head
@ -774,20 +794,20 @@ virDomainEventPtr virDomainEventNew(int id, const char *name,
const unsigned char *uuid,
int type, int detail)
{
virDomainEventPtr event;
virDomainEventLifecyclePtr event;
if (virObjectEventInitialize() < 0)
return NULL;
if (!(event = virDomainEventNewInternal(virDomainEventClass,
VIR_DOMAIN_EVENT_ID_LIFECYCLE,
id, name, uuid)))
if (!(event = virDomainEventNewInternal(virDomainEventLifecycleClass,
VIR_DOMAIN_EVENT_ID_LIFECYCLE,
id, name, uuid)))
return NULL;
event->data.lifecycle.type = type;
event->data.lifecycle.detail = detail;
event->type = type;
event->detail = detail;
return event;
return (virDomainEventPtr)event;
}
virDomainEventPtr virDomainEventNewFromDom(virDomainPtr dom, int type, int detail)
@ -1460,11 +1480,16 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn,
switch ((virDomainEventID) eventID) {
case VIR_DOMAIN_EVENT_ID_LIFECYCLE:
((virConnectDomainEventCallback)cb)(conn, dom,
event->data.lifecycle.type,
event->data.lifecycle.detail,
cbopaque);
goto cleanup;
{
virDomainEventLifecyclePtr lifecycleEvent;
lifecycleEvent = (virDomainEventLifecyclePtr)event;
((virConnectDomainEventCallback)cb)(conn, dom,
lifecycleEvent->type,
lifecycleEvent->detail,
cbopaque);
goto cleanup;
}
case VIR_DOMAIN_EVENT_ID_REBOOT:
(cb)(conn, dom,