From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53138 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUEER-0001pY-Qi for qemu-devel@nongnu.org; Thu, 01 Jul 2010 03:30:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUEEP-0007ah-91 for qemu-devel@nongnu.org; Thu, 01 Jul 2010 03:30:47 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:58076) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUEEP-0007aD-2h for qemu-devel@nongnu.org; Thu, 01 Jul 2010 03:30:45 -0400 From: Markus Armbruster Date: Thu, 1 Jul 2010 09:30:38 +0200 Message-Id: <1277969441-22879-11-git-send-email-armbru@redhat.com> In-Reply-To: <1277969441-22879-1-git-send-email-armbru@redhat.com> References: <1277969441-22879-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 10/13] block: Clean up bdrv_snapshots() 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, kraxel@redhat.com, hch@lst.de Signed-off-by: Markus Armbruster --- block.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index acb4182..603874d 100644 --- a/block.c +++ b/block.c @@ -1783,19 +1783,18 @@ BlockDriverState *bdrv_snapshots(void) { BlockDriverState *bs; - if (bs_snapshots) + if (bs_snapshots) { return bs_snapshots; + } bs = NULL; while ((bs = bdrv_next(bs))) { if (bdrv_can_snapshot(bs)) { - goto ok; + bs_snapshots = bs; + return bs; } } return NULL; - ok: - bs_snapshots = bs; - return bs; } int bdrv_snapshot_create(BlockDriverState *bs, -- 1.6.6.1