From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6DKU-0003mU-In for qemu-devel@nongnu.org; Mon, 14 Nov 2016 04:13:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6DKR-0005h0-Cw for qemu-devel@nongnu.org; Mon, 14 Nov 2016 04:13:30 -0500 Received: from 5.mo4.mail-out.ovh.net ([188.165.44.50]:58280) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c6DKR-0005gg-6z for qemu-devel@nongnu.org; Mon, 14 Nov 2016 04:13:27 -0500 Received: from player750.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 1BBF81CF7F for ; Mon, 14 Nov 2016 10:13:26 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 14 Nov 2016 10:12:57 +0100 Message-Id: <1479114778-3881-4-git-send-email-clg@kaod.org> In-Reply-To: <1479114778-3881-1-git-send-email-clg@kaod.org> References: <1479114778-3881-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 3/4] ppc/pnv: Fix fatal bug on 32-bit hosts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: David Gibson , qemu-devel@nongnu.org, Alexander Graf , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= From: David Gibson If the pnv machine type is compiled on a 32-bit host, the unsigned long (host) type is 32-bit. This means that the hweight_long() used to calculate the number of allowed cores only considers the low 32 bits of the cores_mask variable, and can thus return 0 in some circumstances. This corrects the bug. Signed-off-by: David Gibson Suggested-by: Richard Henderson [clg: replaced hweight_long() by ctpop64() ] Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/pnv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index e7779581545d..9df7b25315af 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -620,7 +620,7 @@ static void pnv_chip_core_sanitize(PnvChip *chip, Err= or **errp) chip->cores_mask &=3D pcc->cores_mask; =20 /* now that we have a sane layout, let check the number of cores */ - cores_max =3D hweight_long(chip->cores_mask); + cores_max =3D ctpop64(chip->cores_mask); if (chip->nr_cores > cores_max) { error_setg(errp, "warning: too many cores for chip ! Limit is %d= ", cores_max); --=20 2.7.4