From patchwork Sat Feb 27 09:20:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8443951 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1A453C0553 for ; Sat, 27 Feb 2016 09:22:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 894CB20375 for ; Sat, 27 Feb 2016 09:22:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7B6D20303 for ; Sat, 27 Feb 2016 09:22:13 +0000 (UTC) Received: from localhost ([::1]:54008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZb4m-0000e1-Us for patchwork-qemu-devel@patchwork.kernel.org; Sat, 27 Feb 2016 04:22:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZb4V-0000Xl-4j for qemu-devel@nongnu.org; Sat, 27 Feb 2016 04:21:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZb4U-0005eu-D9 for qemu-devel@nongnu.org; Sat, 27 Feb 2016 04:21:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZb4R-0005a1-4O; Sat, 27 Feb 2016 04:21:51 -0500 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 (Postfix) with ESMTPS id CD04F80514; Sat, 27 Feb 2016 09:21:50 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-4-159.pek2.redhat.com [10.72.4.159]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1R9Kwi2028695; Sat, 27 Feb 2016 04:21:47 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Sat, 27 Feb 2016 17:20:53 +0800 Message-Id: <1456564857-29160-12-git-send-email-famz@redhat.com> In-Reply-To: <1456564857-29160-1-git-send-email-famz@redhat.com> References: <1456564857-29160-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org Subject: [Qemu-devel] [PATCH v3 11/15] block: Assert that bdrv_release_dirty_bitmap succeeded X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We use a loop over bs->dirty_bitmaps to make sure the caller is only releasing a bitmap owned by bs. Let's also assert that in this case the caller is releasing a bitmap that does exist. Signed-off-by: Fam Zheng Reviewed-by: John Snow --- block/dirty-bitmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index a0c5acb..27d33e7 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -304,6 +304,9 @@ static void bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs, } } } + if (bitmap) { + abort(); + } } void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap)