[PATCH 14/17] qemuDomainRemoveInactiveLocked: Remove 'driver' argument

From: Peter Krempa <pkrempa(a)redhat.com&gt; The function can extract the value from @vm's private data. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_domain.c | 5 ++--- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_process.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8ad7a57a85..90258e9603 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5849,8 +5849,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver, * from locked list method. */ void -qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, - virDomainObj *vm) +qemuDomainRemoveInactiveLocked(virDomainObj *vm) { if (vm->persistent) { /* Short-circuit, we don't want to remove a persistent domain */ @@ -5859,7 +5858,7 @@ qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, qemuDomainRemoveInactiveCommon(vm, 0, false); - virDomainObjListRemoveLocked(driver->domains, vm); + virDomainObjListRemoveLocked(QEMU_DOMAIN_PRIVATE(vm)->driver->domains, vm); } void diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8c1993ec64..56683848aa 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -697,8 +697,7 @@ void qemuDomainRemoveInactive(virQEMUDriver *driver, bool migration); void -qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, - virDomainObj *vm); +qemuDomainRemoveInactiveLocked(virDomainObj *vm); void qemuDomainSetFakeReboot(virDomainObj *vm, bool value); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1432ec28d7..50c7b47256 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9871,7 +9871,7 @@ qemuProcessReconnectHelper(virDomainObj *obj, */ qemuProcessStop(obj, VIR_DOMAIN_SHUTOFF_FAILED, VIR_ASYNC_JOB_NONE, 0); - qemuDomainRemoveInactiveLocked(src->driver, obj); + qemuDomainRemoveInactiveLocked(obj); virDomainObjEndAPI(&obj); g_clear_object(&data->identity); -- 2.49.0