From: Eduardo Habkost <ehabkost@redhat.com>
To: Max Reitz <mreitz@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
qemu-devel@nongnu.org, Richard Henderson <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH v2] i386/kvm: Fix build with -m32
Date: Mon, 24 Jun 2019 17:00:35 -0300 [thread overview]
Message-ID: <20190624200035.GN1862@habkost.net> (raw)
In-Reply-To: <20190624193913.28343-1-mreitz@redhat.com>
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 <mreitz@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> 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
next prev parent reply other threads:[~2019-06-24 20:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 19:39 [Qemu-devel] [PATCH v2] i386/kvm: Fix build with -m32 Max Reitz
2019-06-24 20:00 ` Eduardo Habkost [this message]
2019-06-25 10:30 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190624200035.GN1862@habkost.net \
--to=ehabkost@redhat.com \
--cc=mreitz@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).