From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56826 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OeCJO-0002eA-WF for qemu-devel@nongnu.org; Wed, 28 Jul 2010 15:29:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OeCJ9-00044S-BK for qemu-devel@nongnu.org; Wed, 28 Jul 2010 15:28:52 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:38583) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OeCJ9-00044J-5x for qemu-devel@nongnu.org; Wed, 28 Jul 2010 15:28:51 -0400 Received: by ywt2 with SMTP id 2so1126241ywt.4 for ; Wed, 28 Jul 2010 12:28:50 -0700 (PDT) From: Miguel Di Ciurcio Filho Date: Wed, 28 Jul 2010 16:30:22 -0300 Message-Id: <1280345424-12918-2-git-send-email-miguel.filho@gmail.com> In-Reply-To: <1280345424-12918-1-git-send-email-miguel.filho@gmail.com> References: <1280345424-12918-1-git-send-email-miguel.filho@gmail.com> Subject: [Qemu-devel] [PATCH 1/3] cleanup: bdrv_snaphost_find() returns zero or -ENOENT List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Miguel Di Ciurcio Filho , armbru@redhat.com, lcapitulino@redhat.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 --- 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