[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] kvmclock: Fix feature detection
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 1/6] kvmclock: Fix feature detection |
Date: |
Fri, 5 Aug 2011 17:55:26 -0300 |
From: Jan Kiszka <address@hidden>
Bit-wise or the feature flags and drop the obsolete #ifdef.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
hw/kvmclock.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/kvmclock.c b/hw/kvmclock.c
index 692ad18..b73aec4 100644
--- a/hw/kvmclock.c
+++ b/hw/kvmclock.c
@@ -101,11 +101,8 @@ static SysBusDeviceInfo kvmclock_info = {
void kvmclock_create(void)
{
if (kvm_enabled() &&
- first_cpu->cpuid_kvm_features & ((1ULL << KVM_FEATURE_CLOCKSOURCE)
-#ifdef KVM_FEATURE_CLOCKSOURCE2
- || (1ULL << KVM_FEATURE_CLOCKSOURCE2)
-#endif
- )) {
+ first_cpu->cpuid_kvm_features & ((1ULL << KVM_FEATURE_CLOCKSOURCE) |
+ (1ULL << KVM_FEATURE_CLOCKSOURCE2))) {
sysbus_create_simple("kvmclock", -1, NULL);
}
}
--
1.7.5.4
- [Qemu-devel] [PATCH 0/6] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/08/05
- [Qemu-devel] [PATCH 6/6] Remove #ifdef KVM_CAP_TSC_CONTROL, Marcelo Tosatti, 2011/08/05
- [Qemu-devel] [PATCH 1/6] kvmclock: Fix feature detection,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 3/6] qemu: Add strtosz_suffix_unit function, Marcelo Tosatti, 2011/08/05
- [Qemu-devel] [PATCH 5/6] qemu-x86: Set tsc_khz in kvm when supported, Marcelo Tosatti, 2011/08/05
- [Qemu-devel] [PATCH 4/6] qemu-x86: Add tsc_freq option to -cpu, Marcelo Tosatti, 2011/08/05
- [Qemu-devel] [PATCH 2/6] kvm: Drop obsolete KVM_IOEVENTFD #ifdefs, Marcelo Tosatti, 2011/08/05
- Re: [Qemu-devel] [PATCH 0/6] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2011/08/08