Skip to content

Commit

Permalink
commit: Remove unused check
Browse files Browse the repository at this point in the history
We support top == active for commit now, remove the check and add an
assertion here.

Signed-off-by: Fam Zheng <[email protected]>
Reviewed-by: Kevin Wolf <[email protected]>
Signed-off-by: Stefan Hajnoczi <[email protected]>
  • Loading branch information
Fam Zheng authored and stefanhaRH committed Dec 20, 2013
1 parent 4de4347 commit 18da7f9
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions block/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 18da7f9

Please sign in to comment.