Fix domain events callback type (John Levon)

diff --git a/ChangeLog b/ChangeLog
index ef16818547b2444a569028fe588a827ac975fc57..9f07e202ffe90beac79a6be4daae18cd1abf0dfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 17 21:45:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       Use correct type for domain events callbacks args (John Levon)
+       * src/driver.h, src/qemu_driver.c, src/remote_internal.c,
+       src/xen_unified.c: s/void */virConnectDomainEventCallback/
+       for domain events callbacks
+
 Wed Dec 17 21:41:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/libvirt_sym.version.in: Remove non-existant symbols

diff --git a/src/driver.h b/src/driver.h
index 8c394e2628ec023b84c6d71b1f8517baf23b0b57..32d425730ea7791eff22ec63788833828230edf8 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -282,14 +282,14 @@ typedef unsigned long long
 typedef int
     (*virDrvDomainEventRegister)
                     (virConnectPtr conn,
-                     void *callback,
+                     virConnectDomainEventCallback cb,
                      void *opaque,
                      virFreeCallback freecb);
 
 typedef int
     (*virDrvDomainEventDeregister)
                     (virConnectPtr conn,
-                     void *callback);
+                     virConnectDomainEventCallback cb);
 
 typedef int
     (*virDrvDomainMigratePrepare2)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 3cd843c0f6e65f4d1b5a8fe43cb229fc2d530156..3815da3b709bfcf19f865a21a0edefee386f68a5 100644 (file)
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -3767,7 +3767,7 @@ cleanup:
 
 static int
 qemudDomainEventRegister (virConnectPtr conn,
-                          void *callback,
+                          virConnectDomainEventCallback callback,
                           void *opaque,
                           virFreeCallback freecb)
 {
@@ -3784,7 +3784,7 @@ qemudDomainEventRegister (virConnectPtr conn,
 
 static int
 qemudDomainEventDeregister (virConnectPtr conn,
-                            void *callback)
+                            virConnectDomainEventCallback callback)
 {
     struct qemud_driver *driver = conn->privateData;
     int ret;

diff --git a/src/remote_internal.c b/src/remote_internal.c
index 71def558b0c0c6f253fa5aaf02681cbee38fc532..8e747144d56b7fa18b2810ce0e862ce64594faa3 100644 (file)
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -4724,8 +4724,8 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
 /*----------------------------------------------------------------------*/
 
 static int remoteDomainEventRegister (virConnectPtr conn,
-                                      void *callback ATTRIBUTE_UNUSED,
-                                      void *opaque ATTRIBUTE_UNUSED,
+                                      virConnectDomainEventCallback callback,
+                                      void *opaque,
                                       virFreeCallback freecb)
 {
     struct private_data *priv = conn->privateData;
@@ -4752,7 +4752,7 @@ static int remoteDomainEventRegister (virConnectPtr conn,
 }
 
 static int remoteDomainEventDeregister (virConnectPtr conn,
-                                 void *callback ATTRIBUTE_UNUSED)
+                                        virConnectDomainEventCallback callback)
 {
     struct private_data *priv = conn->privateData;
 

diff --git a/src/xen_unified.c b/src/xen_unified.c
index 0be2dd36f1dcaf6a3972dc8b5d14544d53e8c16f..4be9b17d059d07e99acc0e37302fa22e705904fb 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -1360,7 +1360,7 @@ xenUnifiedNodeGetFreeMemory (virConnectPtr conn)
 
 static int
 xenUnifiedDomainEventRegister (virConnectPtr conn,
-                               void *callback,
+                               virConnectDomainEventCallback callback,
                                void *opaque,
                                void (*freefunc)(void *))
 {
@@ -1377,7 +1377,7 @@ xenUnifiedDomainEventRegister (virConnectPtr conn,
 
 static int
 xenUnifiedDomainEventDeregister (virConnectPtr conn,
-                                 void *callback)
+                                 virConnectDomainEventCallback callback)
 {
     int ret;
     GET_PRIVATE (conn);