diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-08 14:38:42 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-08 14:38:42 -0500 |
| commit | 986563b173ca2d4bd47b10455b19c86e5cd5bba2 (patch) | |
| tree | 25db73df4cb973bf86c58341cb82415ab8d2c90b /hw | |
| parent | 039523397fce67ccb15a9b71ef812f9a69286aa5 (diff) | |
| parent | ac363c9042eb1010b88af0a202c09475ef909972 (diff) | |
| download | qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.zip qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.tar.gz qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'hw')
| -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 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); } } |