qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de
Subject: [Qemu-devel] [PATCH v3 10/13] block: Clean up bdrv_snapshots()
Date: Thu,  1 Jul 2010 09:30:38 +0200	[thread overview]
Message-ID: <1277969441-22879-11-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1277969441-22879-1-git-send-email-armbru@redhat.com>


Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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

  parent reply	other threads:[~2010-07-01  7:30 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-01  7:30 [Qemu-devel] [PATCH v3 00/13] More block-related fixes and cleanups Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 01/13] scsi: scsi_bus_legacy_handle_cmdline() can fail, fix callers Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 02/13] ide: Make it explicit that ide_create_drive() can't fail Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 03/13] blockdev: Remove drive_get_serial() Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 04/13] blockdev: New drive_get_by_blockdev() Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 05/13] blockdev: Clean up automatic drive deletion Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 06/13] qdev: Decouple qdev_prop_drive from DriveInfo Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 07/13] blockdev: drive_get_by_id() is no longer used, remove Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 08/13] block: Catch attempt to attach multiple devices to a blockdev Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 09/13] savevm: Survive hot-unplug of snapshot device Markus Armbruster
2010-07-01  7:30 ` Markus Armbruster [this message]
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 11/13] block: Fix virtual media change for if=none Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 12/13] ide: Make PIIX and ISA IDE init functions return the qdev Markus Armbruster
2010-07-01  7:30 ` [Qemu-devel] [PATCH v3 13/13] pc: Fix CMOS info for drives defined with -device Markus Armbruster
2010-07-01  8:48 ` [Qemu-devel] Re: [PATCH v3 00/13] More block-related fixes and cleanups Kevin Wolf

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=1277969441-22879-11-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=hch@lst.de \
    --cc=kraxel@redhat.com \
    --cc=kwolf@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).