From patchwork Fri Aug 5 20:55:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 108731 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 46A6AB6F72 for ; Sat, 6 Aug 2011 06:56:24 +1000 (EST) Received: from localhost ([::1]:60081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpRRM-0000xr-Gc for incoming@patchwork.ozlabs.org; Fri, 05 Aug 2011 16:56:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpRRB-0000xP-Ul for qemu-devel@nongnu.org; Fri, 05 Aug 2011 16:56:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QpRRA-00024G-G3 for qemu-devel@nongnu.org; Fri, 05 Aug 2011 16:56:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpRRA-000244-6D for qemu-devel@nongnu.org; Fri, 05 Aug 2011 16:56:08 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p75Ku6if028387 (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-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p75Ku6jr029329; 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 p75Ku4Th020577; 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 0450C656104; Fri, 5 Aug 2011 17:55:59 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id p75KtuDL023380; Fri, 5 Aug 2011 17:55:56 -0300 From: Marcelo Tosatti To: Anthony Liguori Date: Fri, 5 Aug 2011 17:55:31 -0300 Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 6/6] Remove #ifdef KVM_CAP_TSC_CONTROL 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 Signed-off-by: Marcelo Tosatti --- target-i386/kvm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 923d2d5..31b88b7 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -504,7 +504,6 @@ int kvm_arch_init_vcpu(CPUState *env) if (r) return r; -#ifdef KVM_CAP_TSC_CONTROL r = kvm_check_extension(env->kvm_state, KVM_CAP_TSC_CONTROL); if (r && env->tsc_khz) { r = kvm_vcpu_ioctl(env, KVM_SET_TSC_KHZ, env->tsc_khz); @@ -513,7 +512,6 @@ int kvm_arch_init_vcpu(CPUState *env) return r; } } -#endif return 0; }