Rename virDomainEventCallback to virObjectEventCallback

The event callbacks will be generalized to handle events
for any object type.

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 19e392000e7fe1d50a1eff8daf90a8cceb644a59..fd68820a23d43d00e620145932a642229db9146b 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -43,7 +43,7 @@ typedef virDomainMeta *virDomainMetaPtr;
 struct _virDomainEventCallbackList {
     unsigned int nextID;
     unsigned int count;
-    virDomainEventCallbackPtr *callbacks;
+    virObjectEventCallbackPtr *callbacks;
 };
 
 struct _virDomainEventQueue {
@@ -63,7 +63,7 @@ struct _virDomainEventState {
     virMutex lock;
 };
 
-struct _virDomainEventCallback {
+struct _virObjectEventCallback {
     int callbackID;
     int eventID;
     virConnectPtr conn;
@@ -355,7 +355,7 @@ virDomainEventCallbackListAddID(virConnectPtr conn,
                                 virFreeCallback freecb,
                                 int *callbackID)
 {
-    virDomainEventCallbackPtr event;
+    virObjectEventCallbackPtr event;
     size_t i;
     int ret = 0;
 
@@ -1366,7 +1366,7 @@ cleanup:
 
 
 static int virDomainEventDispatchMatchCallback(virDomainEventPtr event,
-                                               virDomainEventCallbackPtr cb)
+                                               virObjectEventCallbackPtr cb)
 {
     if (!cb)
         return 0;

diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h
index f6b957d596be525d794fe5ab3efc9d9e6fb12f9f..07b14c478fda3f7493841fcc012268d29c99c283 100644 (file)
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -28,8 +28,8 @@
 
 # include "domain_conf.h"
 
-typedef struct _virDomainEventCallback virDomainEventCallback;
-typedef virDomainEventCallback *virDomainEventCallbackPtr;
+typedef struct _virObjectEventCallback virObjectEventCallback;
+typedef virObjectEventCallback *virObjectEventCallbackPtr;
 
 typedef struct _virDomainEventCallbackList virDomainEventCallbackList;
 typedef virDomainEventCallbackList *virDomainEventCallbackListPtr;