qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL 21/21] qemu-img: Avoid setting ret to unused value in img_convert()
Date: Sun, 12 Feb 2017 02:39:29 +0100	[thread overview]
Message-ID: <20170212013929.6793-4-mreitz@redhat.com> (raw)
In-Reply-To: <20170212013440.5919-1-mreitz@redhat.com>

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(-)

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");
-- 
2.11.0

  parent reply	other threads:[~2017-02-12  1:39 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-12  1:34 [Qemu-devel] [PULL 00/21] Block patches Max Reitz
2017-02-12  1:34 ` [Qemu-devel] [PULL 01/21] iotests: Fix a problem in common.filter Max Reitz
2017-02-12  1:34 ` [Qemu-devel] [PULL 02/21] qemu-img: Improve commit invalid base message Max Reitz
2017-02-12  1:36 ` [Qemu-devel] [PULL 03/21] qapi: Tweak error message of bdrv_query_image_info Max Reitz
2017-02-12  1:36   ` [Qemu-devel] [PULL 04/21] iotests: Fix reference output for 059 Max Reitz
2017-02-12  1:36   ` [Qemu-devel] [PULL 05/21] iotests: record separate timings per format, protocol pair Max Reitz
2017-02-12  1:36   ` [Qemu-devel] [PULL 06/21] block/vmdk: Fix the endian problem of buf_len and lba Max Reitz
2017-02-12  1:36   ` [Qemu-devel] [PULL 07/21] block: check full backing filename when searching protocol filenames Max Reitz
2017-02-12  1:36   ` [Qemu-devel] [PULL 08/21] qemu-iotests: Don't create fifos / pidfiles with protocol paths Max Reitz
2017-02-12  1:36   ` [Qemu-devel] [PULL 09/21] qemu-iotest: test to lookup protocol-based image with relative backing Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 10/21] block/qapi: reduce the coupling between the bdrv_query_stats and bdrv_query_bds_stats Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 11/21] block/qapi: reduce the execution time of qmp_query_blockstats Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 12/21] block: bdrv_invalidate_cache: invalidate children first Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 13/21] block/nfs: fix NULL pointer dereference in URI parsing Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 14/21] block/nfs: fix naming of runtime opts Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 15/21] qemu-io: Return non-zero exit code on failure Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 16/21] qemu-iotests: Add _unsupported_fmt helper Max Reitz
2017-02-12  1:38 ` [Qemu-devel] [PULL 17/21] qemu-io: Add failure regression tests Max Reitz
2017-02-12  1:39 ` [Qemu-devel] [PULL 18/21] qcow2: Optimize the refcount-block overlap check Max Reitz
2017-02-12  1:39 ` [Qemu-devel] [PULL 19/21] qemu-io: don't allow I/O operations larger than BDRV_REQUEST_MAX_BYTES Max Reitz
2017-02-12  1:39 ` [Qemu-devel] [PULL 20/21] qemu-img: Use qemu_strtoul() rather than raw strtoul() Max Reitz
2017-02-12  1:39 ` Max Reitz [this message]
2017-02-13 10:54 ` [Qemu-devel] [PULL 00/21] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170212013929.6793-4-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).