From nobody Wed May 15 08:43:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1561405207; cv=none; d=zoho.com; s=zohoarc; b=mWVdspRbjXr3XN/cWe8+U6whUQOPk5jFtrC3bylMewmUoNlp+bTATiyS1FgtlQ3d6yYW7cgq9/OgOMB3VFV/2S7JxpmRNBPxzQ/YPWMVIKZ1Gi5m2ywMy3S8Qwm5ga3vgp3CQJI7sOF+o4TbMJ6DSEvDCIVlO5pRn2XYoxXBt98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561405207; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=2jTqRfj108GADPqIsx6eDPmowa39h87O+lqwtzj1m2U=; b=YHMSLkDaSZHgIwjt/N1hUy4g2gRt4u38LmTe8RFWK3io3cvrWkAnFqfpkHP6gBg36y12TRuvv3t1ij5MF64IaeMFSPzrCiOIeUyFa01cOTwbgXqfNXd2BosiIlsKVgJWlHeG/vWOqH0Ucb50SIMTLOTqgAcSIlK8GPIK7/EvKzU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561405207019556.525528534552; Mon, 24 Jun 2019 12:40:07 -0700 (PDT) Received: from localhost ([::1]:54230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfUor-0005aA-Mp for importer@patchew.org; Mon, 24 Jun 2019 15:40:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50467) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfUoA-000591-Hz for qemu-devel@nongnu.org; Mon, 24 Jun 2019 15:39:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfUo9-0005JT-BI for qemu-devel@nongnu.org; Mon, 24 Jun 2019 15:39:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfUo9-0005Ij-69 for qemu-devel@nongnu.org; Mon, 24 Jun 2019 15:39:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 838F0308FBAF; Mon, 24 Jun 2019 19:39:15 +0000 (UTC) Received: from localhost (ovpn-204-152.brq.redhat.com [10.40.204.152]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1EC3A5C232; Mon, 24 Jun 2019 19:39:14 +0000 (UTC) From: Max Reitz To: qemu-devel@nongnu.org Date: Mon, 24 Jun 2019 21:39:13 +0200 Message-Id: <20190624193913.28343-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 24 Jun 2019 19:39:15 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] i386/kvm: Fix build with -m32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson , Marcelo Tosatti , Eduardo Habkost , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" find_next_bit() takes a pointer of type "const unsigned long *", but the first argument passed here is a "uint64_t *". These types are incompatible when compiling qemu with -m32. Just use ctz64() instead. Fixes: c686193072a47032d83cb4e131dc49ae30f9e5d Signed-off-by: Max Reitz Reviewed-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/kvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index e4b4f5756a..31490bf8b5 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1043,14 +1043,15 @@ static int hv_cpuid_check_and_set(CPUState *cs, str= uct kvm_cpuid2 *cpuid, CPUX86State *env =3D &cpu->env; uint32_t r, fw, bits; uint64_t deps; - int i, dep_feat =3D 0; + int i, dep_feat; =20 if (!hyperv_feat_enabled(cpu, feature) && !cpu->hyperv_passthrough) { return 0; } =20 deps =3D kvm_hyperv_properties[feature].dependencies; - while ((dep_feat =3D find_next_bit(&deps, 64, dep_feat)) < 64) { + while (deps) { + dep_feat =3D ctz64(deps); if (!(hyperv_feat_enabled(cpu, dep_feat))) { fprintf(stderr, "Hyper-V %s requires Hyper-V %s\n", @@ -1058,7 +1059,7 @@ static int hv_cpuid_check_and_set(CPUState *cs, struc= t kvm_cpuid2 *cpuid, kvm_hyperv_properties[dep_feat].desc); return 1; } - dep_feat++; + deps &=3D ~(1ull << dep_feat); } =20 for (i =3D 0; i < ARRAY_SIZE(kvm_hyperv_properties[feature].flags); i+= +) { --=20 2.21.0