virclosecallbacks: Don't pass opqaue pointer to callback invocation

Remove the argument from the function prototypes and the callback
handler.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 51973ae670002f0cd180b716e8ce8d63a3cc42ac..09ba52483ae149a3165ee9672a4833afc5906f20 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -207,7 +207,7 @@ bhyveConnectClose(virConnectPtr conn)
 {
     struct _bhyveConn *privconn = conn->privateData;
 
-    virCloseCallbacksRun(privconn->closeCallbacks, conn, privconn->domains, privconn);
+    virCloseCallbacksRun(privconn->closeCallbacks, conn, privconn->domains);
     conn->privateData = NULL;
 
     return 0;

diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c
index 40c97cb6ca69b573f22f011a71eeefd266165d57..18002b559b59ad1052fefe492e74f2ff5eb118fc 100644 (file)
--- a/src/bhyve/bhyve_process.c
+++ b/src/bhyve/bhyve_process.c
@@ -56,8 +56,7 @@ VIR_LOG_INIT("bhyve.bhyve_process");
 
 static void
 bhyveProcessAutoDestroy(virDomainObj *vm,
-                        virConnectPtr conn G_GNUC_UNUSED,
-                        void *opaque G_GNUC_UNUSED)
+                        virConnectPtr conn G_GNUC_UNUSED)
 {
     bhyveDomainObjPrivate *priv = vm->privateData;
     struct _bhyveConn *driver = priv->driver;

diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/virclosecallbacks.c
index 84a61b002a3b02b4505c24bbce25db88892540d1..c533e695f1ecdb180a8a8a4f83a75bcbd7b1fe67 100644 (file)
--- a/src/hypervisor/virclosecallbacks.c
+++ b/src/hypervisor/virclosecallbacks.c
@@ -284,8 +284,7 @@ virCloseCallbacksGetForConn(virCloseCallbacks *closeCallbacks,
 void
 virCloseCallbacksRun(virCloseCallbacks *closeCallbacks,
                      virConnectPtr conn,
-                     virDomainObjList *domains,
-                     void *opaque)
+                     virDomainObjList *domains)
 {
     virCloseCallbacksList *list;
     size_t i;
@@ -329,7 +328,7 @@ virCloseCallbacksRun(virCloseCallbacks *closeCallbacks,
          *
          * Call the callback function and end the API usage. */
         virObjectUnref(vm);
-        list->entries[i].callback(vm, conn, opaque);
+        list->entries[i].callback(vm, conn);
         virDomainObjEndAPI(&vm);
     }
     VIR_FREE(list->entries);

diff --git a/src/hypervisor/virclosecallbacks.h b/src/hypervisor/virclosecallbacks.h
index 138e0eb689025227ca14a907cbffe431ad2c9c5e..5a56dea29244bf712dadf5dd9f7a51b43e45c463 100644 (file)
--- a/src/hypervisor/virclosecallbacks.h
+++ b/src/hypervisor/virclosecallbacks.h
@@ -25,8 +25,7 @@
 typedef struct _virCloseCallbacks virCloseCallbacks;
 
 typedef void (*virCloseCallback)(virDomainObj *vm,
-                                 virConnectPtr conn,
-                                 void *opaque);
+                                 virConnectPtr conn);
 
 virCloseCallbacks *
 virCloseCallbacksNew(void);
@@ -52,5 +51,4 @@ virCloseCallbacksGetConn(virCloseCallbacks *closeCallbacks,
 void
 virCloseCallbacksRun(virCloseCallbacks *closeCallbacks,
                      virConnectPtr conn,
-                     virDomainObjList *domains,
-                     void *opaque);
+                     virDomainObjList *domains);

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a42299eeea65fecd21d2d4ff82b472b14744a84c..31de677b881c33e68f1655886429ed5627b88fb1 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -169,7 +169,7 @@ static int lxcConnectClose(virConnectPtr conn)
 {
     virLXCDriver *driver = conn->privateData;
 
-    virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains, driver);
+    virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains);
     conn->privateData = NULL;
     return 0;
 }

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 368adaea7e0ad42c13cdb57e41ca0779870a448b..9722d8e1de66a538d7c13c18e6b435319d83fe82 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -62,8 +62,7 @@ VIR_LOG_INIT("lxc.lxc_process");
 
 static void
 lxcProcessAutoDestroy(virDomainObj *dom,
-                      virConnectPtr conn,
-                      void *opaque G_GNUC_UNUSED)
+                      virConnectPtr conn)
 {
     virObjectEvent *event = NULL;
     virLXCDomainObjPrivate *priv = dom->privateData;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2533e22c382f12e9709fbf01345d412a887cf9e4..9a464ee5d06199e1cda8aa6fde93c9584c4b3a16 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1170,7 +1170,7 @@ static int qemuConnectClose(virConnectPtr conn)
     virQEMUDriver *driver = conn->privateData;
 
     /* Get rid of callbacks registered for this conn */
-    virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains, driver);
+    virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains);
 
     conn->privateData = NULL;
 

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 7de0929a367a7fc8c36f284d0806d122d0b3d490..438f2bc999d28244cd87671be7a21255d206074a 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2163,8 +2163,7 @@ qemuMigrationDstRun(virQEMUDriver *driver,
  */
 static void
 qemuMigrationSrcCleanup(virDomainObj *vm,
-                        virConnectPtr conn,
-                        void *opaque G_GNUC_UNUSED)
+                        virConnectPtr conn)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 472368513d17d358cd228c8f16f865bcbb14bb3b..0923724aabfbd3abe32a24d8eeedd29044dac51f 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8373,8 +8373,7 @@ void qemuProcessStop(virQEMUDriver *driver,
 
 static void
 qemuProcessAutoDestroy(virDomainObj *dom,
-                       virConnectPtr conn,
-                       void *opaque G_GNUC_UNUSED)
+                       virConnectPtr conn)
 {
     qemuDomainObjPrivate *priv = dom->privateData;
     virQEMUDriver *driver = priv->driver;