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 v5 6/6] commit: remove unused check
Date: Wed, 9 Oct 2013 13:19:43 +0800 [thread overview]
Message-ID: <1381295983-18945-7-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1381295983-18945-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>
---
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.3.1
next prev parent reply other threads:[~2013-10-09 5:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 5:19 [Qemu-devel] [PATCH v5 0/6] block: allow commit active as top Fam Zheng
2013-10-09 5:19 ` [Qemu-devel] [PATCH v5 1/6] mirror: don't close target Fam Zheng
2013-10-09 5:19 ` [Qemu-devel] [PATCH v5 2/6] mirror: move base to MirrorBlockJob Fam Zheng
2013-10-09 5:19 ` [Qemu-devel] [PATCH v5 3/6] block: add commit_active_start() Fam Zheng
2013-10-09 5:19 ` [Qemu-devel] [PATCH v5 4/6] commit: support commit active layer Fam Zheng
2013-11-25 10:28 ` Stefan Hajnoczi
2013-10-09 5:19 ` [Qemu-devel] [PATCH v5 5/6] qemu-iotests: update test cases for commit active Fam Zheng
2013-11-25 10:35 ` Stefan Hajnoczi
2013-10-09 5:19 ` Fam Zheng [this message]
2013-11-08 3:12 ` [Qemu-devel] [PATCH v5 0/6] block: allow commit active as top Fam Zheng
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=1381295983-18945-7-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).