qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com,
	Miguel Di Ciurcio Filho <miguel.filho@gmail.com>,
	armbru@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH 1/3] cleanup: bdrv_snaphost_find() returns zero or -ENOENT
Date: Wed, 28 Jul 2010 16:30:22 -0300	[thread overview]
Message-ID: <1280345424-12918-2-git-send-email-miguel.filho@gmail.com> (raw)
In-Reply-To: <1280345424-12918-1-git-send-email-miguel.filho@gmail.com>

The bdrv_snaphost_find() returns zero in case it finds an snapshot or -ENOENT in
case it doesn't.

Checking returning values as >= zero doesn't make sense.

Signed-off-by: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>
---
 savevm.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/savevm.c b/savevm.c
index 7a1de3c..6c6adb0 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1768,7 +1768,7 @@ static int del_existing_snapshots(Monitor *mon, const char *name)
     bs = NULL;
     while ((bs = bdrv_next(bs))) {
         if (bdrv_can_snapshot(bs) &&
-            bdrv_snapshot_find(bs, snapshot, name) >= 0)
+            bdrv_snapshot_find(bs, snapshot, name) == 0)
         {
             ret = bdrv_snapshot_delete(bs, name);
             if (ret < 0) {
@@ -1948,8 +1948,9 @@ int load_vmstate(const char *name)
 
     /* Don't even try to load empty VM states */
     ret = bdrv_snapshot_find(bs, &sn, name);
-    if ((ret >= 0) && (sn.vm_state_size == 0))
-        return -EINVAL;
+    if ((ret == 0) && (sn.vm_state_size == 0)) {
+            return -EINVAL;
+    }
 
     /* restore the VM state */
     f = qemu_fopen_bdrv(bs, 0);
-- 
1.7.1

  reply	other threads:[~2010-07-28 19:29 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-28 19:30 [Qemu-devel] [PATCH 0/3] savem: various cleanups Miguel Di Ciurcio Filho
2010-07-28 19:30 ` Miguel Di Ciurcio Filho [this message]
2010-07-30  9:44   ` [Qemu-devel] [PATCH 1/3] cleanup: bdrv_snaphost_find() returns zero or -ENOENT Markus Armbruster
2010-07-30 13:38     ` Luiz Capitulino
2010-07-28 19:30 ` [Qemu-devel] [PATCH 2/3] cleanup: del_existing_snapshots() must return the upstream error code Miguel Di Ciurcio Filho
2010-07-30  9:45   ` Markus Armbruster
2010-07-30 20:28     ` Miguel Di Ciurcio Filho
2010-08-02 11:06       ` Markus Armbruster
2010-07-28 19:30 ` [Qemu-devel] [PATCH 3/3] savevm: prevent snapshot overwriting and generate a default name Miguel Di Ciurcio Filho
2010-07-30  9:34   ` Markus Armbruster
2010-07-30 13:43     ` Luiz Capitulino
2010-07-30 14:43       ` Markus Armbruster
2010-07-30 14:52         ` Luiz Capitulino
2010-08-02 14:08       ` Chris Lalancette
2010-07-30 13:39   ` [Qemu-devel] " Luiz Capitulino
2010-07-30 14:42     ` Miguel Di Ciurcio Filho
2010-07-30 14:53       ` Luiz Capitulino

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=1280345424-12918-2-git-send-email-miguel.filho@gmail.com \
    --to=miguel.filho@gmail.com \
    --cc=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lcapitulino@redhat.com \
    --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).