|
 |
9ae3a8 |
From 1d78e14b1774a799db6336a4381f91a7af295f38 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 17 Jan 2014 03:08:03 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 20/34] commit: Remove unused check
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1389928083-8921-19-git-send-email-famz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56780
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 18/18] commit: Remove unused check
|
|
|
9ae3a8 |
Bugzilla: 1041301
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
We support top == active for commit now, remove the check and add an
|
|
|
9ae3a8 |
assertion here.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 18da7f94cdce130f2a71387de4980ffa817181a1)
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/commit.c | 8 +-------
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/commit.c | 8 +-------
|
|
|
9ae3a8 |
1 files changed, 1 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/commit.c b/block/commit.c
|
|
|
9ae3a8 |
index d237729..e3e395d 100644
|
|
|
9ae3a8 |
--- a/block/commit.c
|
|
|
9ae3a8 |
+++ b/block/commit.c
|
|
|
9ae3a8 |
@@ -198,13 +198,7 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base,
|
|
|
9ae3a8 |
return;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- /* Once we support top == active layer, remove this check */
|
|
|
9ae3a8 |
- if (top == bs) {
|
|
|
9ae3a8 |
- error_setg(errp,
|
|
|
9ae3a8 |
- "Top image as the active layer is currently unsupported");
|
|
|
9ae3a8 |
- return;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
+ assert(top != bs);
|
|
|
9ae3a8 |
if (top == base) {
|
|
|
9ae3a8 |
error_setg(errp, "Invalid files for merge: top and base are the same");
|
|
|
9ae3a8 |
return;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|