diff mbox series

[PULL,21/21] qemu-img: Avoid setting ret to unused value in img_convert()

Message ID 20170212013929.6793-4-mreitz@redhat.com
State Accepted
Commit 10d6eda1926804a09aa0710ca62933087813de0b
Headers show
Series None | expand

Commit Message

Max Reitz Feb. 12, 2017, 1:39 a.m. UTC 
From: Peter Maydell <peter.maydell@linaro.org>


Coverity points out that we assign the return value from
bdrv_snapshot_load_tmp() to 'ret' in img_convert(), but then
never use that variable. (We check for failure by looking
at local_err instead.) Drop the unused assignment, bringing
the call into line with the following call to
bdrv_snapshot_laod_tmp_by_id_or_name().

(Fixes CID 1247240.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Message-id: 1486744104-15590-3-git-send-email-peter.maydell@linaro.org
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Max Reitz <mreitz@redhat.com>

---
 qemu-img.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.11.0
diff mbox series

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 38266e56b0..cff22e3005 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1968,10 +1968,10 @@  static int img_convert(int argc, char **argv)
     }
 
     if (sn_opts) {
-        ret = bdrv_snapshot_load_tmp(bs[0],
-                                     qemu_opt_get(sn_opts, SNAPSHOT_OPT_ID),
-                                     qemu_opt_get(sn_opts, SNAPSHOT_OPT_NAME),
-                                     &local_err);
+        bdrv_snapshot_load_tmp(bs[0],
+                               qemu_opt_get(sn_opts, SNAPSHOT_OPT_ID),
+                               qemu_opt_get(sn_opts, SNAPSHOT_OPT_NAME),
+                               &local_err);
     } else if (snapshot_name != NULL) {
         if (bs_n > 1) {
             error_report("No support for concatenating multiple snapshot");