From patchwork Mon Feb 1 15:38:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 8180791 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6CF56BEEE5 for ; Mon, 1 Feb 2016 15:42:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A78C203A5 for ; Mon, 1 Feb 2016 15:42:55 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C53D52011E for ; Mon, 1 Feb 2016 15:42:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQGaG-0003ES-9a; Mon, 01 Feb 2016 15:40:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQGaE-0003D9-Pj for xen-devel@lists.xenproject.org; Mon, 01 Feb 2016 15:40:06 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id C5/7C-07165-65C7FA65; Mon, 01 Feb 2016 15:40:06 +0000 X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1454341203!20587486!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22542 invoked from network); 1 Feb 2016 15:40:05 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Feb 2016 15:40:05 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u11Fe0F2027161 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Feb 2016 15:40:01 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u11FdxYJ010555 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 1 Feb 2016 15:40:00 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0122.oracle.com (8.14.4/8.13.8) with ESMTP id u11FdxcB013224; Mon, 1 Feb 2016 15:39:59 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 01 Feb 2016 07:39:59 -0800 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Date: Mon, 1 Feb 2016 10:38:55 -0500 Message-Id: <1454341137-14110-10-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> References: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Boris Ostrovsky , xen-devel@lists.xenproject.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v2 09/11] xen/hvmlite: Use x86's default timer init for HVMlite guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xen_timer_init() will be called from apic_bsp_setup(). Signed-off-by: Boris Ostrovsky --- arch/x86/xen/time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index f1ba6a0..d77b398 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -492,7 +492,10 @@ void __init xen_init_time_ops(void) { pv_time_ops = xen_time_ops; - x86_init.timers.timer_init = xen_time_init; + if (!xen_hvmlite) + x86_init.timers.timer_init = xen_time_init; + else + x86_init.timers.timer_init = x86_init_noop; x86_init.timers.setup_percpu_clockev = x86_init_noop; x86_cpuinit.setup_percpu_clockev = x86_init_noop;