i386/kvm: Fix build with -m32
PATCH v2 1/1 i386/kvm: Fix build with -m32
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.
--- target/i386/kvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
target/i386/kvm.c +4 -3
@@ -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++) {
Signature · 1 line
2.21.0
Quoted 8 lines · Max Reitz
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 c686193072a47032d83cb4e131dc49ae30f9e5dSigned-off-by Max Reitz <[email protected]>
Quoted 38 lines
--- target/i386/kvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)target/i386/kvm.c +4
-3@@ -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++) {Signature · 1 line
2.21.0
Signature · 1 line
Eduardo
Quoted 35 lines · Max Reitz
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 c686193072a47032d83cb4e131dc49ae30f9e5dSigned-off-by Max Reitz <[email protected]>--- target/i386/kvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)target/i386/kvm.c +3
-2@@ -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",
target/i386/kvm.c static int hv_cpuid_check_and_set(CPUState *cs, struct kvm_cpuid2 *cpuid, · line 1062
Quoted 5 lines
target/i386/kvm.c +1
-1@@ -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.
Quoted 4 lines
target/i386/kvm.c +0
-0}for (i =0 ; i <ARRAY_SIZE (kvm_hyperv_properties[feature].flags); i++) {