diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-06-23 10:23:10 +0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-08-05 12:04:27 -0300 |
| commit | cf7d3e64bfc48148bd7a3094fb563428d103d7ed (patch) | |
| tree | 5ad717f92c6254b216df85b70570a3d2b100302d /hw/kvmclock.c | |
| parent | 35d7ace74bd07e3d6983c1fd7cbfab4e11175689 (diff) | |
kvmclock: Fix feature detection
Bit-wise or the feature flags and drop the obsolete #ifdef.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'hw/kvmclock.c')
| -rw-r--r-- | hw/kvmclock.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/hw/kvmclock.c b/hw/kvmclock.c index 692ad182f0..b73aec409c 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); } } |