[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 6/6] commit: remove unused check
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 6/6] commit: remove unused check |
Date: |
Tue, 26 Nov 2013 13:45:08 +0800 |
We support top == active for commit now, remove the check and add an
assertion here.
Signed-off-by: Fam Zheng <address@hidden>
---
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.4.2
- [Qemu-devel] [PATCH v6 0/6] block: allow commit active as top, Fam Zheng, 2013/11/26
- [Qemu-devel] [PATCH v6 1/6] mirror: don't close target, Fam Zheng, 2013/11/26
- [Qemu-devel] [PATCH v6 2/6] mirror: move base to MirrorBlockJob, Fam Zheng, 2013/11/26
- [Qemu-devel] [PATCH v6 3/6] block: add commit_active_start(), Fam Zheng, 2013/11/26
- [Qemu-devel] [PATCH v6 4/6] commit: support commit active layer, Fam Zheng, 2013/11/26
- [Qemu-devel] [PATCH v6 5/6] qemu-iotests: update test cases for commit active, Fam Zheng, 2013/11/26
- [Qemu-devel] [PATCH v6 6/6] commit: remove unused check,
Fam Zheng <=