[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/12] i386/kvm: Fix build with -m32
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/12] i386/kvm: Fix build with -m32 |
Date: |
Fri, 5 Jul 2019 22:23:13 +0200 |
From: Max Reitz <address@hidden>
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>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <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 e4b4f57..31490bf 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++) {
--
1.8.3.1
- [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, (continued)
- [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 01/12] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size(), Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 07/12] target/i386: fix feature check in hyperv-stub.c, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 05/12] intel_iommu: Fix unexpected unmaps during global unmap, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 02/12] checkpatch: do not warn for multiline parenthesized returned value, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 04/12] intel_iommu: Fix incorrect "end" for vtd_address_space_unmap, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 11/12] hw/i386: Fix linker error when ISAPC is disabled, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 09/12] target/i386: kvm: Fix when nested state is needed for migration, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 10/12] Makefile: generate header file with the list of devices enabled, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 06/12] ioapic: clear irq_eoi when updating the ioapic redirect table entry, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 03/12] i386/kvm: Fix build with -m32,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/12] ioapic: use irq number instead of vector in ioapic_eoi_broadcast, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 08/12] minikconf: do not include variables from MINIKCONF_ARGS in config-all-devices.mak, Paolo Bonzini, 2019/07/05
- Re: [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, Peter Maydell, 2019/07/08