From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH][uq/master] kvmclock: Fix feature detection Date: Thu, 23 Jun 2011 10:23:10 +0200 Message-ID: <4E02F7EE.6050000@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm , qemu-devel , Glauber Costa To: Avi Kivity , Marcelo Tosatti Return-path: Received: from fmmailgate01.web.de ([217.72.192.221]:50781 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754769Ab1FWIXM (ORCPT ); Thu, 23 Jun 2011 04:23:12 -0400 Sender: kvm-owner@vger.kernel.org List-ID: From: Jan Kiszka Bit-wise or the feature flags and drop the obsolete #ifdef. Signed-off-by: Jan Kiszka --- 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.1