External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 01:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: snapshot: Remove dead code in 'qemuSnapshotDeleteBlockJobRunning'

Browse Source 
'qemuSnapshotDeleteBlockJobIsRunning' returns only 0 and 1. Convert it
to bool and remove the dead code handling -1 return in the caller.

Closes: https://gitlab.com/libvirt/libvirt/-/issues/682
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2024-10-14 08:09:06 +02:00
parent 2e29ab3269
commit e2c6f4c800
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_snapshot.c
View File

@ -3303,7 +3303,7 @@ qemuSnapshotDeleteUpdateDisks(void *payload,
/* Deleting external snapshot is started by running qemu block-commit job. /* Deleting external snapshot is started by running qemu block-commit job.
* We need to wait for all block-commit jobs to be 'ready' or 'pending' to * We need to wait for all block-commit jobs to be 'ready' or 'pending' to
* continue with external snapshot deletion. */ * continue with external snapshot deletion. */
static int static bool
qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state) qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state)
{ {
switch (state) { switch (state) {
@ -3311,7 +3311,7 @@ qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state)
case QEMU_BLOCKJOB_STATE_RUNNING: case QEMU_BLOCKJOB_STATE_RUNNING:
case QEMU_BLOCKJOB_STATE_ABORTING: case QEMU_BLOCKJOB_STATE_ABORTING:
case QEMU_BLOCKJOB_STATE_PIVOTING: case QEMU_BLOCKJOB_STATE_PIVOTING:
return 1; return true;
case QEMU_BLOCKJOB_STATE_COMPLETED: case QEMU_BLOCKJOB_STATE_COMPLETED:
case QEMU_BLOCKJOB_STATE_FAILED: case QEMU_BLOCKJOB_STATE_FAILED:
@ -3323,7 +3323,7 @@ qemuSnapshotDeleteBlockJobIsRunning(qemuBlockjobState state)
break; break;
} }
return 0; return false;
} }
@ -3359,18 +3359,14 @@ static int
qemuSnapshotDeleteBlockJobRunning(virDomainObj *vm, qemuSnapshotDeleteBlockJobRunning(virDomainObj *vm,
qemuBlockJobData *job) qemuBlockJobData *job)
{ {
int rc;
qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT); qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT);
while ((rc = qemuSnapshotDeleteBlockJobIsRunning(job->state)) > 0) { while (qemuSnapshotDeleteBlockJobIsRunning(job->state)) {
if (qemuDomainObjWait(vm) < 0) if (qemuDomainObjWait(vm) < 0)
return -1; return -1;
qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT); qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_SNAPSHOT);
} }
if (rc < 0)
return -1;
return 0; return 0;
} }