qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com, jcody@redhat.com,
	stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v7 7/7] commit: Remove unused check
Date: Mon, 16 Dec 2013 14:45:33 +0800	[thread overview]
Message-ID: <1387176333-30183-8-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1387176333-30183-1-git-send-email-famz@redhat.com>

We support top == active for commit now, remove the check and add an
assertion here.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
 block/commit.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/block/commit.c b/block/commit.c
index d4090cb..acec4ac 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -198,13 +198,7 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base,
         return;
     }
 
-    /* Once we support top == active layer, remove this check */
-    if (top == bs) {
-        error_setg(errp,
-                   "Top image as the active layer is currently unsupported");
-        return;
-    }
-
+    assert(top != bs);
     if (top == base) {
         error_setg(errp, "Invalid files for merge: top and base are the same");
         return;
-- 
1.8.5.1

  parent reply	other threads:[~2013-12-16  6:46 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-16  6:45 [Qemu-devel] [PATCH v7 0/7] block: allow commit active as top Fam Zheng
2013-12-16  6:45 ` [Qemu-devel] [PATCH v7 1/7] blkdebug: Use QLIST_FOREACH_SAFE to resume IO Fam Zheng
2013-12-16  6:49   ` Fam Zheng
2013-12-16  6:45 ` [Qemu-devel] [PATCH v7 2/7] mirror: Don't close target Fam Zheng
2013-12-16  6:45 ` [Qemu-devel] [PATCH v7 3/7] mirror: Move base to MirrorBlockJob Fam Zheng
2013-12-16  6:45 ` [Qemu-devel] [PATCH v7 4/7] block: Add commit_active_start() Fam Zheng
2013-12-16  6:45 ` [Qemu-devel] [PATCH v7 5/7] commit: Support commit active layer Fam Zheng
2013-12-16  6:45 ` [Qemu-devel] [PATCH v7 6/7] qemu-iotests: Update test cases for commit active Fam Zheng
2013-12-16  6:45 ` Fam Zheng [this message]
2013-12-20 15:40 ` [Qemu-devel] [PATCH v7 0/7] block: allow commit active as top Stefan Hajnoczi

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=1387176333-30183-8-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=jcody@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).