diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 880056852d1c19fdcff35218399578a9ee4528fc..5e5bac5e7808a240def9fc06d6a07c1ad4995a38 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1191,12 +1191,11 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, void *cbopaque) { virDomainPtr dom = virGetDomain(conn, event->meta.name, event->meta.uuid); - int eventID = virObjectEventGetEventID(event); if (!dom) return; dom->id = event->meta.id; - switch ((virDomainEventID) eventID) { + switch ((virDomainEventID) event->eventID) { case VIR_DOMAIN_EVENT_ID_LIFECYCLE: { virDomainEventLifecyclePtr lifecycleEvent; @@ -1360,7 +1359,7 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, break; } - VIR_WARN("Unexpected event ID %d", eventID); + VIR_WARN("Unexpected event ID %d", event->eventID); cleanup: virDomainFree(dom); diff --git a/src/conf/object_event.c b/src/conf/object_event.c index f05949943d52525db40b6592fd218f7586396f36..dad98d63f769c36004f2d85314f1f71f1b49c2c9 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -73,18 +73,6 @@ virClassForObjectEvent(void) return virObjectEventClass; } -int -virObjectEventGetEventID(void *anyobj) -{ - virObjectEventPtr obj = anyobj; - - if (!virObjectIsClass(obj, virClassForObjectEvent())) { - VIR_WARN("Object %p (%s) is not a virObjectEvent instance", - obj, obj ? virClassName(obj->parent.klass) : "(unknown)"); - return -1; - } - return obj->eventID; -} static void virObjectEventDispose(void *obj) @@ -599,7 +587,7 @@ virObjectEventDispatchMatchCallback(virObjectEventPtr event, return 0; if (!virObjectIsClass(event, cb->klass)) return 0; - if (cb->eventID != virObjectEventGetEventID(event)) + if (cb->eventID != event->eventID) return 0; if (cb->meta) { diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h index 89c76752189c4cda616a88f80cee8e43fa012a9c..bc80425a32df7a0569b5c8014b03bae87567ba2e 100644 --- a/src/conf/object_event_private.h +++ b/src/conf/object_event_private.h @@ -1,7 +1,7 @@ /* * object_event_private.h: object event queue processing helpers * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * @@ -86,9 +86,6 @@ struct _virObjectEvent { virClassPtr virClassForObjectEvent(void); -int -virObjectEventGetEventID(void *anyobj); - int virObjectEventCallbackListAddID(virConnectPtr conn, virObjectEventCallbackListPtr cbList,