From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52724 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUjXK-0004M1-I8 for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:56:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUjVA-0004Hl-7M for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:54:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58404) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUjVA-0004HX-0e for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:54:08 -0400 From: Kevin Wolf Date: Fri, 2 Jul 2010 18:38:26 +0200 Message-Id: <1278088712-12302-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1278088712-12302-1-git-send-email-kwolf@redhat.com> References: <1278088712-12302-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/23] block: Clean up bdrv_snapshots() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- block.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index feda755..003d132 100644 --- a/block.c +++ b/block.c @@ -1789,19 +1789,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