summary refs log tree commit diff stats
path: root/block/commit.c
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2013-12-16 14:45:33 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2013-12-20 16:26:16 +0100
commit18da7f94cdce130f2a71387de4980ffa817181a1 (patch)
tree1c5f4d47df7652161136b9e669b0828339b14725 /block/commit.c
parent4de43470f2f35762b4b3e6a59b4aed55e239024a (diff)
downloadfocaccia-qemu-18da7f94cdce130f2a71387de4980ffa817181a1.tar.gz
focaccia-qemu-18da7f94cdce130f2a71387de4980ffa817181a1.zip
commit: Remove unused check
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>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/commit.c')
-rw-r--r--block/commit.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/block/commit.c b/block/commit.c
index d4090cbf7d..acec4ac5a8 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;