[PATCH 01/10] qemu: snapshot: Don't overwrite 'ret' in qemuSnapshotCreateActiveExternal

Peter Krempa via Devel posted 10 patches 2 days, 2 hours ago
[PATCH 01/10] qemu: snapshot: Don't overwrite 'ret' in qemuSnapshotCreateActiveExternal
Posted by Peter Krempa via Devel 2 days, 2 hours ago
From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>

Both qemuSaveImageCreate and qemuSnapshotCreateActiveExternalDisks
follow the usual convention of returning 0 on success and -1 on error so
there's no need store the values in 'ret'.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/qemu/qemu_snapshot.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 5b0b52e2ba..5ceaff3554 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1756,9 +1756,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
         if (!(snap_params = qemuMigrationParamsNew()))
             goto cleanup;

-        if ((ret = qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile,
-                                       data, compressor, snap_params, 0,
-                                       VIR_ASYNC_JOB_SNAPSHOT)) < 0)
+        if (qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile,
+                                data, compressor, snap_params, 0,
+                                VIR_ASYNC_JOB_SNAPSHOT) < 0)
             goto cleanup;

         /* the memory image was created, remove it on errors */
@@ -1775,9 +1775,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
         qemuSnapshotCreateActiveExternalDisksManual(vm, snap, VIR_ASYNC_JOB_SNAPSHOT) < 0)
         goto cleanup;

-    if ((ret = qemuSnapshotCreateActiveExternalDisks(vm, snap,
-                                                     blockNamedNodeData, flags,
-                                                     VIR_ASYNC_JOB_SNAPSHOT)) < 0)
+    if (qemuSnapshotCreateActiveExternalDisks(vm, snap,
+                                              blockNamedNodeData, flags,
+                                              VIR_ASYNC_JOB_SNAPSHOT) < 0)
         goto cleanup;

     /* the snapshot is complete now */
-- 
2.52.0