NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virclosecallbacks: Don't pass opqaue pointer to callback invocation

Browse Source 
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>
This commit is contained in:
Peter Krempa 2022-05-02 15:24:51 +02:00
parent e90301134c
commit 579403ba2e
9 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bhyve/bhyve_driver.c
View File

@ -207,7 +207,7 @@ bhyveConnectClose(virConnectPtr conn)
{ {
struct _bhyveConn *privconn = conn->privateData; struct _bhyveConn *privconn = conn->privateData;
virCloseCallbacksRun(privconn->closeCallbacks, conn, privconn->domains, privconn); virCloseCallbacksRun(privconn->closeCallbacks, conn, privconn->domains);
conn->privateData = NULL; conn->privateData = NULL;
return 0; return 0;

3
src/bhyve/bhyve_process.c
View File

@ -56,8 +56,7 @@ VIR_LOG_INIT("bhyve.bhyve_process");
static void static void
bhyveProcessAutoDestroy(virDomainObj *vm, bhyveProcessAutoDestroy(virDomainObj *vm,
virConnectPtr conn G_GNUC_UNUSED, virConnectPtr conn G_GNUC_UNUSED)
void *opaque G_GNUC_UNUSED)
{ {
bhyveDomainObjPrivate *priv = vm->privateData; bhyveDomainObjPrivate *priv = vm->privateData;
struct _bhyveConn *driver = priv->driver; struct _bhyveConn *driver = priv->driver;

5
src/hypervisor/virclosecallbacks.c
View File

@ -284,8 +284,7 @@ virCloseCallbacksGetForConn(virCloseCallbacks *closeCallbacks,
void void
virCloseCallbacksRun(virCloseCallbacks *closeCallbacks, virCloseCallbacksRun(virCloseCallbacks *closeCallbacks,
virConnectPtr conn, virConnectPtr conn,
virDomainObjList *domains, virDomainObjList *domains)
void *opaque)
{ {
virCloseCallbacksList *list; virCloseCallbacksList *list;
size_t i; size_t i;
@ -329,7 +328,7 @@ virCloseCallbacksRun(virCloseCallbacks *closeCallbacks,
* *
* Call the callback function and end the API usage. */ * Call the callback function and end the API usage. */
virObjectUnref(vm); virObjectUnref(vm);
list->entries[i].callback(vm, conn, opaque); list->entries[i].callback(vm, conn);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
} }
VIR_FREE(list->entries); VIR_FREE(list->entries);

6
src/hypervisor/virclosecallbacks.h
View File

@ -25,8 +25,7 @@
typedef struct _virCloseCallbacks virCloseCallbacks; typedef struct _virCloseCallbacks virCloseCallbacks;
typedef void (*virCloseCallback)(virDomainObj *vm, typedef void (*virCloseCallback)(virDomainObj *vm,
virConnectPtr conn, virConnectPtr conn);
void *opaque);
virCloseCallbacks * virCloseCallbacks *
virCloseCallbacksNew(void); virCloseCallbacksNew(void);
@ -52,5 +51,4 @@ virCloseCallbacksGetConn(virCloseCallbacks *closeCallbacks,
void void
virCloseCallbacksRun(virCloseCallbacks *closeCallbacks, virCloseCallbacksRun(virCloseCallbacks *closeCallbacks,
virConnectPtr conn, virConnectPtr conn,
virDomainObjList *domains, virDomainObjList *domains);
void *opaque);

2
src/lxc/lxc_driver.c
View File

@ -169,7 +169,7 @@ static int lxcConnectClose(virConnectPtr conn)
{ {
virLXCDriver *driver = conn->privateData; virLXCDriver *driver = conn->privateData;
virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains, driver); virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains);
conn->privateData = NULL; conn->privateData = NULL;
return 0; return 0;
} }

3
src/lxc/lxc_process.c
View File

@ -62,8 +62,7 @@ VIR_LOG_INIT("lxc.lxc_process");
static void static void
lxcProcessAutoDestroy(virDomainObj *dom, lxcProcessAutoDestroy(virDomainObj *dom,
virConnectPtr conn, virConnectPtr conn)
void *opaque G_GNUC_UNUSED)
{ {
virObjectEvent *event = NULL; virObjectEvent *event = NULL;
virLXCDomainObjPrivate *priv = dom->privateData; virLXCDomainObjPrivate *priv = dom->privateData;

2
src/qemu/qemu_driver.c
View File

@ -1170,7 +1170,7 @@ static int qemuConnectClose(virConnectPtr conn)
virQEMUDriver *driver = conn->privateData; virQEMUDriver *driver = conn->privateData;
/* Get rid of callbacks registered for this conn */ /* Get rid of callbacks registered for this conn */
virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains, driver); virCloseCallbacksRun(driver->closeCallbacks, conn, driver->domains);
conn->privateData = NULL; conn->privateData = NULL;

3
src/qemu/qemu_migration.c
View File

@ -2163,8 +2163,7 @@ qemuMigrationDstRun(virQEMUDriver *driver,
*/ */
static void static void
qemuMigrationSrcCleanup(virDomainObj *vm, qemuMigrationSrcCleanup(virDomainObj *vm,
virConnectPtr conn, virConnectPtr conn)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
virQEMUDriver *driver = priv->driver; virQEMUDriver *driver = priv->driver;

3
src/qemu/qemu_process.c
View File

@ -8373,8 +8373,7 @@ void qemuProcessStop(virQEMUDriver *driver,
static void static void
qemuProcessAutoDestroy(virDomainObj *dom, qemuProcessAutoDestroy(virDomainObj *dom,
virConnectPtr conn, virConnectPtr conn)
void *opaque G_GNUC_UNUSED)
{ {
qemuDomainObjPrivate *priv = dom->privateData; qemuDomainObjPrivate *priv = dom->privateData;
virQEMUDriver *driver = priv->driver; virQEMUDriver *driver = priv->driver;