Skip to contentSkip to conversation

i386/kvm: Fix build with -m32

PATCH Superseded Max Reitz 2 participants 5 messages Jun 24, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Max Reitz

author
#0 lore raw

PATCH 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 cast it to "const void *", find_next_bit() works fine with any type on little-endian hosts (which x86 is).

Fixes c686193072a47032d83cb4e131dc49ae30f9e5d
---
 target/i386/kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/i386/kvm.c +1 -1
index e4b4f5756a..1b5f3b1c00 100644
@@ -1050,7 +1050,7 @@ static int hv_cpuid_check_and_set(CPUState *cs, struct kvm_cpuid2 *cpuid,
     }
 
     deps = kvm_hyperv_properties[feature].dependencies;
-    while ((dep_feat = find_next_bit(&deps, 64, dep_feat)) < 64) {
+    while ((dep_feat = find_next_bit((const void *)&deps, 64, dep_feat)) < 64) {
         if (!(hyperv_feat_enabled(cpu, dep_feat))) {
                 fprintf(stderr,
                         "Hyper-V %s requires Hyper-V %s\n",
Signature · 1 line
2.21.0
#1 lore raw
Quoted 9 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 cast it to "const void *", find_next_bit() works fine with any type on little-endian hosts (which x86 is).

Fixes c686193072a47032d83cb4e131dc49ae30f9e5d

Why not declare kvm_hyperv_properties.dependencies with the right type for bitmaps, using
unsigned long dependencies[BITS_TO_LONGS(64)]
?

Quoted 20 lines
---
 target/i386/kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/i386/kvm.c +1 -1
index e4b4f5756a..1b5f3b1c00 100644
@@ -1050,7 +1050,7 @@ static int hv_cpuid_check_and_set(CPUState *cs, struct kvm_cpuid2 *cpuid,
     }
 
     deps = kvm_hyperv_properties[feature].dependencies;
-    while ((dep_feat = find_next_bit(&deps, 64, dep_feat)) < 64) {
+    while ((dep_feat = find_next_bit((const void *)&deps, 64, dep_feat)) < 64) {
         if (!(hyperv_feat_enabled(cpu, dep_feat))) {
                 fprintf(stderr,
                         "Hyper-V %s requires Hyper-V %s\n",
Signature · 1 line
2.21.0
Signature · 1 line
Eduardo
author
#2 lore raw
Quoted 8 lines · Eduardo Habkost
Quoted 7 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 cast it to "const void *", find_next_bit() works fine with any type on little-endian hosts (which x86 is).

Quoted 7 lines
Quoted 2 lines
Fixes c686193072a47032d83cb4e131dc49ae30f9e5d

Why not declare kvm_hyperv_properties.dependencies with the right type for bitmaps, using
unsigned long dependencies[BITS_TO_LONGS(64)]
?

How would you (statically) initialize that field, then?

I cannot imagine a reasonable static way that does not invoke the same “The host must be little-endian, so it’s OK” assumption.

The better question is perhaps, why not use ffsll(). Hm. I don’t know, maybe I should?

Max

author
#3 lore raw
Quoted 17 lines · Max Reitz
Quoted 8 lines · Eduardo Habkost
Quoted 7 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 cast it to "const void *", find_next_bit() works fine with any type on little-endian hosts (which x86 is).

Quoted 7 lines
Quoted 2 lines
Fixes c686193072a47032d83cb4e131dc49ae30f9e5d

Why not declare kvm_hyperv_properties.dependencies with the right type for bitmaps, using
unsigned long dependencies[BITS_TO_LONGS(64)]
?

Quoted 4 lines

How would you (statically) initialize that field, then?

I cannot imagine a reasonable static way that does not invoke the same “The host must be little-endian, so it’s OK” assumption.

Sorry, brain fart. That’s not the problem because in either case, the lower index will receive the lower-indexed bits.

But we’d still have to deal with the fact that it could either be one or two indices, which doesn’t seem nice to initialize either.

Max

Quoted 5 lines

The better question is perhaps, why not use ffsll(). Hm. I don’t know, maybe I should?

Max

#4 lore raw
Quoted 20 lines · Max Reitz
Quoted 19 lines · Max Reitz
Quoted 8 lines · Eduardo Habkost
Quoted 7 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 cast it to "const void *", find_next_bit() works fine with any type on little-endian hosts (which x86 is).

Quoted 7 lines
Quoted 2 lines
Fixes c686193072a47032d83cb4e131dc49ae30f9e5d

Why not declare kvm_hyperv_properties.dependencies with the right type for bitmaps, using
unsigned long dependencies[BITS_TO_LONGS(64)]
?

How would you (statically) initialize that field, then?

Quoted 8 lines
Quoted 2 lines

I cannot imagine a reasonable static way that does not invoke the same “The host must be little-endian, so it’s OK” assumption.

Sorry, brain fart. That’s not the problem because in either case, the lower index will receive the lower-indexed bits.

But we’d still have to deal with the fact that it could either be one or two indices, which doesn’t seem nice to initialize either.

Right, a uint64_t field is more convenient to initialize.

Quoted 5 lines

Max

Quoted 2 lines

The better question is perhaps, why not use ffsll(). Hm. I don’t know, maybe I should?

uint64_t + ffsll() seems simple and appropriate.

Signature · 1 line
Eduardo