From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758856AbZEMDM6 (ORCPT ); Tue, 12 May 2009 23:12:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756059AbZEMDGU (ORCPT ); Tue, 12 May 2009 23:06:20 -0400 Received: from adsl-99-35-133-201.dsl.pltn13.sbcglobal.net ([99.35.133.201]:36222 "EHLO abulafia.goop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756006AbZEMDGJ (ORCPT ); Tue, 12 May 2009 23:06:09 -0400 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: the arch/x86 maintainers , Linux Kernel Mailing List , Xen-devel , Jeremy Fitzhardinge , Jeremy Fitzhardinge Subject: [PATCH 12/16] xen/dom0: add XEN_DOM0 config option Date: Tue, 12 May 2009 14:28:34 -0700 Message-Id: <1242163718-2934-13-git-send-email-jeremy@goop.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1242163718-2934-1-git-send-email-jeremy@goop.org> References: <1242163718-2934-1-git-send-email-jeremy@goop.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow dom0 to be configured. Requires more patches to do something useful. Also announce whether we're running dom0 as part of xen boot message. [ Impact: add Kconfig to enable XEN_DOM0 ] Signed-off-by: Jeremy Fitzhardinge --- arch/x86/xen/Kconfig | 26 ++++++++++++++++++++++++++ arch/x86/xen/enlighten.c | 6 ++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index b83e119..fe69286 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -36,3 +36,29 @@ config XEN_DEBUG_FS help Enable statistics output and various tuning options in debugfs. Enabling this option may incur a significant performance overhead. + +config XEN_DOM0 + bool "Enable Xen privileged domain support" + depends on XEN && X86_IO_APIC && ACPI + help + The Xen hypervisor requires a privileged domain ("dom0") to + actually manage the machine, provide devices drivers, etc. + This option enables dom0 support. A dom0 kernel can also + run as an unprivileged domU kernel, or a kernel running + native on bare hardware. + +# Dummy symbol since people have come to rely on the PRIVILEGED_GUEST +# name in tools. +config XEN_PRIVILEGED_GUEST + def_bool XEN_DOM0 + +config XEN_PCI_PASSTHROUGH + bool #"Enable support for Xen PCI passthrough devices" + depends on XEN && PCI + help + Enable support for passing PCI devices through to + unprivileged domains. (COMPLETELY UNTESTED) + +config XEN_DOM0_PCI + def_bool y + depends on XEN_DOM0 && PCI diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 79b9b84..784971d 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -172,9 +172,11 @@ static void __init xen_banner(void) printk(KERN_INFO "Booting paravirtualized kernel on %s\n", pv_info.name); - printk(KERN_INFO "Xen version: %d.%d%s%s\n", + printk(KERN_INFO "Xen version: %d.%d%s%s%s\n", version >> 16, version & 0xffff, extra.extraversion, - xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); + xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? + " (preserve-AD)" : "", + xen_initial_domain() ? " (dom0)" : ""); } static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0; -- 1.6.0.6