From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 1 Jul 2010 07:30:38 +0000 (+0200)
Subject: block: Clean up bdrv_snapshots()
X-Git-Tag: v0.13.0-rc0~109^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ac906f771c42363dc05e0a393defd21a57d3790;p=thirdparty%2Fqemu.git

block: Clean up bdrv_snapshots()

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block.c b/block.c
index feda755294e..003d13213e0 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,