From: Peter Krempa <pkre...@redhat.com>
The function can fetch it from @vm.
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
src/qemu/qemu_domain.c | 5 ++---
src/qemu/qemu_domain.h | 3 +--
src/qemu/qemu_driver.c | 20 ++++++++++----------
src/qemu/qemu_migration.c | 12 ++++++------
src/qemu/qemu_process.c | 4 ++--
src/qemu/qemu_snapshot.c | 4 ++--
6 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 90258e9603..a7e4198316 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5825,8 +5825,7 @@ qemuDomainRemoveInactiveCommon(virDomainObj *vm,
* The caller must hold a lock to the vm.
*/
void
-qemuDomainRemoveInactive(virQEMUDriver *driver,
- virDomainObj *vm,
+qemuDomainRemoveInactive(virDomainObj *vm,
virDomainUndefineFlagsValues flags,
bool migration)
{
@@ -5837,7 +5836,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver,
qemuDomainRemoveInactiveCommon(vm, flags, migration);
- virDomainObjListRemove(driver->domains, vm);
+ virDomainObjListRemove(QEMU_DOMAIN_PRIVATE(vm)->driver->domains, vm);
}
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 56683848aa..ee6074c9f6 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -691,8 +691,7 @@ int qemuDomainMomentDiscardAll(void *payload,
const char *name,
void *data);
-void qemuDomainRemoveInactive(virQEMUDriver *driver,
- virDomainObj *vm,
+void qemuDomainRemoveInactive(virDomainObj *vm,
virDomainUndefineFlagsValues flags,
bool migration);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 50a5cdd594..893fa0c66c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1577,7 +1577,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr
conn,
goto cleanup;
if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, flags) < 0) {
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
goto cleanup;
}
@@ -1586,7 +1586,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr
conn,
VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
start_flags) < 0) {
virDomainAuditStart(vm, "booted", false);
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
qemuProcessEndJob(vm);
goto cleanup;
}
@@ -2071,7 +2071,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
ret = 0;
endjob:
if (ret == 0)
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
qemuProcessEndStopJob(vm);
cleanup:
@@ -2707,7 +2707,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver,
}
virDomainObjEndAsyncJob(vm);
if (ret == 0)
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
cleanup:
virQEMUSaveDataFree(data);
@@ -3243,7 +3243,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom,
virDomainObjEndAsyncJob(vm);
if (ret == 0 && flags & VIR_DUMP_CRASH)
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
cleanup:
virDomainObjEndAPI(&vm);
@@ -3563,7 +3563,7 @@ processGuestPanicEvent(virQEMUDriver *driver,
endjob:
virDomainObjEndAsyncJob(vm);
if (removeInactive)
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
}
@@ -3891,7 +3891,7 @@ processMonitorEOFEvent(virQEMUDriver *driver,
virObjectEventStateQueue(driver->domainEventState, event);
endjob:
- qemuDomainRemoveInactive(driver, vm, 0, migration);
+ qemuDomainRemoveInactive(vm, 0, migration);
qemuProcessEndStopJob(vm);
}
@@ -5853,7 +5853,7 @@ qemuDomainRestoreInternal(virConnectPtr conn,
virFileWrapperFdFree(wrapperFd);
virQEMUSaveDataFree(data);
if (vm && ret < 0)
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
virDomainObjEndAPI(&vm);
return ret;
}
@@ -6505,7 +6505,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn,
} else {
/* Brand new domain. Remove it */
VIR_INFO("Deleting domain '%s'", vm->def->name);
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
}
}
@@ -6648,7 +6648,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
*/
vm->persistent = 0;
if (!virDomainObjIsActive(vm))
- qemuDomainRemoveInactive(driver, vm, flags, false);
+ qemuDomainRemoveInactive(vm, flags, false);
ret = 0;
endjob:
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index f38733f904..2a01ca58bd 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3609,7 +3609,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
* and there is no 'goto cleanup;' in the middle of those */
VIR_FREE(priv->origname);
virDomainObjRemoveTransientDef(vm);
- qemuDomainRemoveInactive(driver, vm, 0, true);
+ qemuDomainRemoveInactive(vm, 0, true);
}
virDomainObjEndAPI(&vm);
virErrorRestore(&origErr);
@@ -4256,7 +4256,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver,
virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm);
vm->persistent = 0;
}
- qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, true);
+ qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true);
}
cleanup:
@@ -6335,7 +6335,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm);
vm->persistent = 0;
}
- qemuDomainRemoveInactive(driver, vm, 0, true);
+ qemuDomainRemoveInactive(vm, 0, true);
}
virErrorRestore(&orig_err);
@@ -6420,7 +6420,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
}
if (!virDomainObjIsActive(vm))
- qemuDomainRemoveInactive(driver, vm, 0, true);
+ qemuDomainRemoveInactive(vm, 0, true);
return ret;
}
@@ -6977,7 +6977,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
}
if (!qemuDomainObjIsActive(vm))
- qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, true);
+ qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true);
virErrorRestore(&orig_err);
return NULL;
@@ -7113,7 +7113,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver,
qemuMigrationJobFinish(vm);
if (!virDomainObjIsActive(vm))
- qemuDomainRemoveInactive(driver, vm, 0, true);
+ qemuDomainRemoveInactive(vm, 0, true);
}
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 9d53768fed..ae54c807eb 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -9273,7 +9273,7 @@ qemuProcessAutoDestroy(virDomainObj *dom,
VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
- qemuDomainRemoveInactive(driver, dom, 0, !!(stopFlags &
VIR_QEMU_PROCESS_STOP_MIGRATED));
+ qemuDomainRemoveInactive(dom, 0, !!(stopFlags &
VIR_QEMU_PROCESS_STOP_MIGRATED));
qemuProcessEndStopJob(dom);
@@ -9795,7 +9795,7 @@ qemuProcessReconnect(void *opaque)
if (jobStarted)
virDomainObjEndJob(obj);
if (!virDomainObjIsActive(obj))
- qemuDomainRemoveInactive(driver, obj, 0, false);
+ qemuDomainRemoveInactive(obj, 0, false);
virDomainObjEndAPI(&obj);
virIdentitySetCurrent(NULL);
return;
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index a17b976381..8128154749 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -2698,7 +2698,7 @@ qemuSnapshotRevertActive(virDomainObj *vm,
error:
if (!virDomainObjIsActive(vm))
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
return -1;
}
@@ -2823,7 +2823,7 @@ qemuSnapshotRevertInactive(virDomainObj *vm,
error:
if (!virDomainObjIsActive(vm))
- qemuDomainRemoveInactive(driver, vm, 0, false);
+ qemuDomainRemoveInactive(vm, 0, false);
return -1;
}
--
2.49.0
