commit 18da7f94cdce130f2a71387de4980ffa817181a1
author Fam Zheng <famz@redhat.com> Mon Dec 16 14:45:33 2013 +0800
committer Stefan Hajnoczi <stefanha@redhat.com> Fri Dec 20 16:26:16 2013 +0100
tree 1c5f4d47df7652161136b9e669b0828339b14725
parent 4de43470f2f35762b4b3e6a59b4aed55e239024a

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>

block/commit.c

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 @@
         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;