From patchwork Mon Jul 30 07:13:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 10548607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 05FBF14BC for ; Mon, 30 Jul 2018 07:43:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF0A92838F for ; Mon, 30 Jul 2018 07:43:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E397F284D4; Mon, 30 Jul 2018 07:43:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 9FB552838F for ; Mon, 30 Jul 2018 07:43:07 +0000 (UTC) Received: from localhost ([::1]:50942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk2pe-0006Kx-SW for patchwork-qemu-devel@patchwork.kernel.org; Mon, 30 Jul 2018 03:43:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk2oT-0005T6-V6 for qemu-devel@nongnu.org; Mon, 30 Jul 2018 03:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk2oT-0001Li-8Z for qemu-devel@nongnu.org; Mon, 30 Jul 2018 03:41:53 -0400 Received: from mga05.intel.com ([192.55.52.43]:40271) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk2oS-0001LU-VT for qemu-devel@nongnu.org; Mon, 30 Jul 2018 03:41:53 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jul 2018 00:41:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,422,1526367600"; d="scan'208";a="75663665" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by fmsmga004.fm.intel.com with ESMTP; 30 Jul 2018 00:41:48 -0700 From: Wei Wang To: qemu-devel@nongnu.org, peterx@redhat.com, dgilbert@redhat.com, quintela@redhat.com Date: Mon, 30 Jul 2018 15:13:57 +0800 Message-Id: <1532934837-5966-3-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532934837-5966-1-git-send-email-wei.w.wang@intel.com> References: <1532934837-5966-1-git-send-email-wei.w.wang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH 2/2] bitmap: fix bitmap_count_one X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since "nbits = 0" is not applicable to the BITMAP_LAST_WORD_MASK macro, callers need to avoid passing "nbits = 0" to this macro, which generates incorrect results. Signed-off-by: Wei Wang CC: Dr. David Alan Gilbert CC: Juan Quintela CC: Peter Xu --- include/qemu/bitmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h index f53c640..e45e9c0 100644 --- a/include/qemu/bitmap.h +++ b/include/qemu/bitmap.h @@ -223,7 +223,7 @@ static inline int bitmap_intersects(const unsigned long *src1, static inline long bitmap_count_one(const unsigned long *bitmap, long nbits) { if (small_nbits(nbits)) { - return ctpopl(*bitmap & BITMAP_LAST_WORD_MASK(nbits)); + return nbits ? ctpopl(*bitmap & BITMAP_LAST_WORD_MASK(nbits)) : 0; } else { return slow_bitmap_count_one(bitmap, nbits); }