From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE62EC43613 for ; Mon, 24 Jun 2019 20:03:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8CBE820663 for ; Mon, 24 Jun 2019 20:03:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CBE820663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfVBu-00064Y-C8 for qemu-devel@archiver.kernel.org; Mon, 24 Jun 2019 16:03:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55346) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfV8p-0004sp-Ax for qemu-devel@nongnu.org; Mon, 24 Jun 2019 16:00:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfV8o-0001zS-65 for qemu-devel@nongnu.org; Mon, 24 Jun 2019 16:00:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfV8n-0001yN-Vr for qemu-devel@nongnu.org; Mon, 24 Jun 2019 16:00:38 -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 099D6307D983; Mon, 24 Jun 2019 20:00:37 +0000 (UTC) Received: from localhost (ovpn-116-76.gru2.redhat.com [10.97.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D3855C231; Mon, 24 Jun 2019 20:00:36 +0000 (UTC) Date: Mon, 24 Jun 2019 17:00:35 -0300 From: Eduardo Habkost To: Max Reitz Message-ID: <20190624200035.GN1862@habkost.net> References: <20190624193913.28343-1-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190624193913.28343-1-mreitz@redhat.com> 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.48]); Mon, 24 Jun 2019 20:00:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [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 , Marcelo Tosatti , qemu-devel@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Jun 24, 2019 at 09:39:13PM +0200, Max Reitz wrote: > 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 > --- > 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, struct kvm_cpuid2 *cpuid, > CPUX86State *env = &cpu->env; > uint32_t r, fw, bits; > uint64_t deps; > - int i, dep_feat = 0; > + int i, dep_feat; > > if (!hyperv_feat_enabled(cpu, feature) && !cpu->hyperv_passthrough) { > return 0; > } > > deps = kvm_hyperv_properties[feature].dependencies; > - while ((dep_feat = find_next_bit(&deps, 64, dep_feat)) < 64) { > + while (deps) { > + dep_feat = 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, struct kvm_cpuid2 *cpuid, > kvm_hyperv_properties[dep_feat].desc); > return 1; > } > - dep_feat++; > + deps &= ~(1ull << dep_feat); > } > > for (i = 0; i < ARRAY_SIZE(kvm_hyperv_properties[feature].flags); i++) { > -- > 2.21.0 > -- Eduardo