From patchwork Fri Aug 5 20:55:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 108730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 48D34B6F76 for ; Sat, 6 Aug 2011 06:56:23 +1000 (EST) Received: from localhost ([::1]:60082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpRRL-0000y4-E7 for incoming@patchwork.ozlabs.org; Fri, 05 Aug 2011 16:56:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpRRD-0000xS-EF for qemu-devel@nongnu.org; Fri, 05 Aug 2011 16:56:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QpRRA-00024K-GC for qemu-devel@nongnu.org; Fri, 05 Aug 2011 16:56:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpRRA-000245-6I for qemu-devel@nongnu.org; Fri, 05 Aug 2011 16:56:08 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p75Ku6cU004999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Aug 2011 16:56:07 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p75Ku68t013501; Fri, 5 Aug 2011 16:56:06 -0400 Received: from amt.cnet (vpn1-7-153.ams2.redhat.com [10.36.7.153]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p75Ku4Vw020574; Fri, 5 Aug 2011 16:56:05 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 20E696560FF; Fri, 5 Aug 2011 17:55:41 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id p75KtboD023375; Fri, 5 Aug 2011 17:55:37 -0300 From: Marcelo Tosatti To: Anthony Liguori Date: Fri, 5 Aug 2011 17:55:26 -0300 Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 1/6] kvmclock: Fix feature detection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Bit-wise or the feature flags and drop the obsolete #ifdef. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- 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); } }