10:28 a.m.
From: Peter Krempa <pkrempa(a)redhat.com>
For now it's extracted as a temporary variable but in long term it ought
to be eliminated.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_driver.c | 22 ++++++++--------------
src/qemu/qemu_migration.c | 8 ++++----
src/qemu/qemu_process.c | 21 +++++++++++----------
src/qemu/qemu_process.h | 3 +--
src/qemu/qemu_saveimage.c | 2 +-
src/qemu/qemu_snapshot.c | 18 ++++++------------
6 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6d43c2415c..50a5cdd594 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2057,8 +2057,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED,
- VIR_ASYNC_JOB_NONE, stopFlags);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_DESTROYED, VIR_ASYNC_JOB_NONE, stopFlags);
if ((flags & VIR_DOMAIN_DESTROY_REMOVE_LOGS) &&
qemuDomainRemoveLogs(driver, vm->def->name) < 0)
@@ -2681,8 +2680,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver,
goto endjob;
/* Shut it down */
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED,
- VIR_ASYNC_JOB_SAVE, 0);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_SAVED, VIR_ASYNC_JOB_SAVE, 0);
virDomainAuditStop(vm, "saved");
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SAVED);
@@ -3212,8 +3210,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom,
endjob:
if ((ret == 0) && (flags & VIR_DUMP_CRASH)) {
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED,
- VIR_ASYNC_JOB_DUMP, 0);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_CRASHED, VIR_ASYNC_JOB_DUMP, 0);
virDomainAuditStop(vm, "crashed");
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED,
@@ -3535,8 +3532,7 @@ processGuestPanicEvent(virQEMUDriver *driver,
G_GNUC_FALLTHROUGH;
case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY:
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED,
- VIR_ASYNC_JOB_DUMP, 0);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_CRASHED, VIR_ASYNC_JOB_DUMP, 0);
event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_CRASHED);
@@ -3890,7 +3886,7 @@ processMonitorEOFEvent(virQEMUDriver *driver,
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
eventReason);
- qemuProcessStop(driver, vm, stopReason, VIR_ASYNC_JOB_NONE, stopFlags);
+ qemuProcessStop(vm, stopReason, VIR_ASYNC_JOB_NONE, stopFlags);
virDomainAuditStop(vm, auditReason);
virObjectEventStateQueue(driver->domainEventState, event);
@@ -4050,15 +4046,13 @@ processNbdkitExitedEvent(virDomainObj *vm,
static void
-processShutdownCompletedEvent(virQEMUDriver *driver,
- virDomainObj *vm)
+processShutdownCompletedEvent(virDomainObj *vm)
{
if (qemuProcessBeginStopJob(vm, VIR_JOB_DESTROY, true) < 0)
return;
if (virDomainObjIsActive(vm)) {
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_UNKNOWN,
- VIR_ASYNC_JOB_NONE, 0);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_UNKNOWN, VIR_ASYNC_JOB_NONE, 0);
}
qemuProcessEndStopJob(vm);
@@ -4129,7 +4123,7 @@ static void qemuProcessEventHandler(void *data, void *opaque)
processNbdkitExitedEvent(vm, processEvent->data);
break;
case QEMU_PROCESS_EVENT_SHUTDOWN_COMPLETED:
- processShutdownCompletedEvent(driver, vm);
+ processShutdownCompletedEvent(vm);
break;
case QEMU_PROCESS_EVENT_LAST:
break;
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index bb4d74a65d..f38733f904 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3438,7 +3438,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
if (!relabel)
stopFlags |= VIR_QEMU_PROCESS_STOP_NO_RELABEL;
virDomainAuditStart(vm, "migrated", false);
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_ASYNC_JOB_MIGRATION_IN, stopFlags);
virPortAllocatorRelease(priv->nbdPort);
priv->nbdPort = 0;
@@ -4082,7 +4082,7 @@ qemuMigrationSrcComplete(virQEMUDriver *driver,
* up domain shutdown until SPICE server transfers its data */
qemuMigrationSrcWaitForSpice(vm);
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED, asyncJob,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_MIGRATED, asyncJob,
VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "migrated");
@@ -6301,7 +6301,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
* confirm step.
*/
if (!v3proto) {
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_MIGRATED,
VIR_ASYNC_JOB_MIGRATION_OUT,
VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "migrated");
@@ -6954,7 +6954,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
if (qemuDomainObjIsActive(vm)) {
if (doKill) {
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_ASYNC_JOB_MIGRATION_IN,
VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "failed");
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 5636d4fb76..1432ec28d7 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5961,7 +5961,7 @@ qemuProcessInit(virQEMUDriver *driver,
stopFlags = VIR_QEMU_PROCESS_STOP_NO_RELABEL;
if (migration)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags);
return -1;
}
@@ -8568,7 +8568,7 @@ qemuProcessStart(virConnectPtr conn,
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
if (priv->mon)
qemuMonitorSetDomainLog(priv->mon, NULL, NULL, NULL);
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags);
goto cleanup;
}
@@ -8917,15 +8917,16 @@ qemuProcessEndStopJob(virDomainObj *vm)
}
-void qemuProcessStop(virQEMUDriver *driver,
- virDomainObj *vm,
- virDomainShutoffReason reason,
- virDomainAsyncJob asyncJob,
- unsigned int flags)
+void
+qemuProcessStop(virDomainObj *vm,
+ virDomainShutoffReason reason,
+ virDomainAsyncJob asyncJob,
+ unsigned int flags)
{
int ret;
int retries = 0;
qemuDomainObjPrivate *priv = vm->privateData;
+ virQEMUDriver *driver = priv->driver;
virErrorPtr orig_err;
virDomainDef *def = vm->def;
size_t i;
@@ -9264,7 +9265,7 @@ qemuProcessAutoDestroy(virDomainObj *dom,
if (qemuProcessBeginStopJob(dom, VIR_JOB_DESTROY, true) < 0)
return;
- qemuProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED,
+ qemuProcessStop(dom, VIR_DOMAIN_SHUTOFF_DESTROYED,
VIR_ASYNC_JOB_NONE, stopFlags);
virDomainAuditStop(dom, "destroyed");
@@ -9828,7 +9829,7 @@ qemuProcessReconnect(void *opaque)
* thread didn't have a chance to start playing with the domain yet
* (it's all we can do anyway).
*/
- qemuProcessStop(driver, obj, state, VIR_ASYNC_JOB_NONE, stopFlags);
+ qemuProcessStop(obj, state, VIR_ASYNC_JOB_NONE, stopFlags);
}
goto cleanup;
}
@@ -9868,7 +9869,7 @@ qemuProcessReconnectHelper(virDomainObj *obj,
* is no thread that could be doing anything else with the same domain
* object.
*/
- qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED,
+ qemuProcessStop(obj, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_ASYNC_JOB_NONE, 0);
qemuDomainRemoveInactiveLocked(src->driver, obj);
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 6d5f189aa4..b8c4af4aaf 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -176,8 +176,7 @@ int qemuProcessBeginStopJob(virDomainObj *vm,
virDomainJob job,
bool forceKill);
void qemuProcessEndStopJob(virDomainObj *vm);
-void qemuProcessStop(virQEMUDriver *driver,
- virDomainObj *vm,
+void qemuProcessStop(virDomainObj *vm,
virDomainShutoffReason reason,
virDomainAsyncJob asyncJob,
unsigned int flags);
diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index a6a5fb486e..702df641a0 100644
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -773,7 +773,7 @@ qemuSaveImageStartVM(virConnectPtr conn,
cleanup:
if (ret < 0 && started) {
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED,
asyncJob, VIR_QEMU_PROCESS_STOP_MIGRATED);
}
return ret;
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index db5ba1eece..a17b976381 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -595,7 +595,7 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) {
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT,
VIR_ASYNC_JOB_SNAPSHOT, 0);
virDomainAuditStop(vm, "from-snapshot");
resume = false;
@@ -1694,8 +1694,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) {
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT,
- VIR_ASYNC_JOB_SNAPSHOT, 0);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, VIR_ASYNC_JOB_SNAPSHOT,
0);
virDomainAuditStop(vm, "from-snapshot");
resume = false;
thaw = false;
@@ -2615,9 +2614,7 @@ qemuSnapshotRevertActive(virDomainObj *vm,
/* Transitions 2, 3, 5, 6, 8, 9 */
if (virDomainObjIsActive(vm)) {
/* Transitions 5, 6, 8, 9 */
- qemuProcessStop(driver, vm,
- VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT,
- VIR_ASYNC_JOB_SNAPSHOT, 0);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, VIR_ASYNC_JOB_SNAPSHOT,
0);
virDomainAuditStop(vm, "from-snapshot");
detail = VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT;
event = virDomainEventLifecycleNewFromObj(vm,
@@ -2651,7 +2648,7 @@ qemuSnapshotRevertActive(virDomainObj *vm,
start_flags, "from-snapshot",
&started) < 0) {
if (started) {
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_ASYNC_JOB_SNAPSHOT,
VIR_QEMU_PROCESS_STOP_MIGRATED);
}
@@ -2761,8 +2758,7 @@ qemuSnapshotRevertInactive(virDomainObj *vm,
if (virDomainObjIsActive(vm)) {
/* Transitions 4, 7 */
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT,
- VIR_ASYNC_JOB_SNAPSHOT, 0);
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, VIR_ASYNC_JOB_SNAPSHOT,
0);
virDomainAuditStop(vm, "from-snapshot");
detail = VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT;
event = virDomainEventLifecycleNewFromObj(vm,
@@ -4356,8 +4352,6 @@ qemuSnapshotDelete(virDomainObj *vm,
virDomainMomentObj *snap = NULL;
bool metadata_only = !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY);
bool stop_qemu = false;
- qemuDomainObjPrivate *priv = vm->privateData;
- virQEMUDriver *driver = priv->driver;
g_autoslist(qemuSnapshotDeleteExternalData) externalData = NULL;
virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN |
@@ -4393,7 +4387,7 @@ qemuSnapshotDelete(virDomainObj *vm,
endjob:
if (stop_qemu) {
- qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN,
+ qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN,
VIR_ASYNC_JOB_SNAPSHOT, 0);
}
--
2.49.0