From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQcCJ-0001Bo-Ba for qemu-devel@nongnu.org; Mon, 30 Sep 2013 08:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQcCD-0005sM-Bu for qemu-devel@nongnu.org; Mon, 30 Sep 2013 08:03:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQcCD-0005sD-5T for qemu-devel@nongnu.org; Mon, 30 Sep 2013 08:03:25 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8UC3O2T012291 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 30 Sep 2013 08:03:24 -0400 From: Fam Zheng Date: Mon, 30 Sep 2013 20:02:57 +0800 Message-Id: <1380542578-2387-7-git-send-email-famz@redhat.com> In-Reply-To: <1380542578-2387-1-git-send-email-famz@redhat.com> References: <1380542578-2387-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 6/7] commit: remove unused check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, jcody@redhat.com, famz@redhat.com, stefanha@redhat.com We support top == active for commit now, remove the check which is dead code now. Signed-off-by: Fam Zheng --- block/commit.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/block/commit.c b/block/commit.c index ac4b7cc..086f8c9 100644 --- a/block/commit.c +++ b/block/commit.c @@ -198,13 +198,6 @@ 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; - } - if (top == base) { error_setg(errp, "Invalid files for merge: top and base are the same"); return; -- 1.8.3.1