[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2] i386/kvm: Fix build with -m32
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v2] i386/kvm: Fix build with -m32 |
Date: |
Tue, 25 Jun 2019 12:30:55 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 |
On 6/24/19 9:39 PM, 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 <address@hidden>
> ---
> 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);
Easier than using deposit64(), OK.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> }
>
> for (i = 0; i < ARRAY_SIZE(kvm_hyperv_properties[feature].flags); i++) {
>