From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753081AbcBAPkL (ORCPT ); Mon, 1 Feb 2016 10:40:11 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:19176 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752583AbcBAPkD (ORCPT ); Mon, 1 Feb 2016 10:40:03 -0500 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, roger.pau@citrix.com, mcgrof@suse.com, Boris Ostrovsky Subject: [PATCH v2 03/11] xen/hvmlite: Initialize HVMlite kernel Date: Mon, 1 Feb 2016 10:38:49 -0500 Message-Id: <1454341137-14110-4-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: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org HVMlite guests need to make a few additional initialization calls compared to regular HVM guests. Signed-off-by: Boris Ostrovsky --- arch/x86/xen/enlighten.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 5f05fa2..1409de6 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1863,15 +1863,21 @@ static void __init init_hvm_pv_info(void) minor = eax & 0xffff; printk(KERN_INFO "Xen version %d.%d.\n", major, minor); - cpuid(base + 2, &pages, &msr, &ecx, &edx); - - pfn = __pa(hypercall_page); - wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32)); + /* HVMlite set up hypercall page earlier in xen_prepare_hvmlite() */ + if (xen_hvmlite) { + pv_info.name = "Xen HVMlite"; + pv_info.paravirt_enabled = 1; + xen_init_apic(); + machine_ops = xen_machine_ops; + } else { + pv_info.name = "Xen HVM"; + cpuid(base + 2, &pages, &msr, &ecx, &edx); + pfn = __pa(hypercall_page); + wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32)); + } xen_setup_features(); - pv_info.name = "Xen HVM"; - xen_domain_type = XEN_HVM_DOMAIN; } -- 1.7.1