Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752638AbaFFXLZ (ORCPT ); Fri, 6 Jun 2014 19:11:25 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]:55995 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752418AbaFFXLX (ORCPT ); Fri, 6 Jun 2014 19:11:23 -0400 From: "Luis R. Rodriguez" To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" , Borislav Petkov , Pekka Enberg , David Rientjes , Michal Marek , Randy Dunlap , levinsasha928@gmail.com, mtosatti@redhat.com, fengguang.wu@intel.com, David Vrabel , Ian Campbell , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org Subject: [PATCH 2/3] x86, platform, xen, kconfig: add xen defconfig helper Date: Fri, 6 Jun 2014 16:11:08 -0700 Message-Id: <1402096269-4512-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402096269-4512-1-git-send-email-mcgrof@do-not-panic.com> References: <1402096269-4512-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Luis R. Rodriguez" This lets you build a kernel which can support xen dom0 or xen gusets by just using: make xenconfig Technically xen supports a dom0 kernel and also a guest kernel configuration but upon review with the xen team since we don't have many dom0 options its best to just combine these two into one. Cc: Borislav Petkov Cc: Pekka Enberg Cc: David Rientjes Cc: Michal Marek Cc: Randy Dunlap Cc: penberg@kernel.org Cc: levinsasha928@gmail.com Cc: mtosatti@redhat.com Cc: fengguang.wu@intel.com Cc: David Vrabel Cc: Ian Campbell Cc: Konrad Rzeszutek Wilk Cc: xen-devel@lists.xenproject.org Signed-off-by: Luis R. Rodriguez --- arch/x86/Makefile | 7 +++++++ arch/x86/configs/xen.config | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 arch/x86/configs/xen.config diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 37621ac..9db34e2 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -256,6 +256,12 @@ kvmconfig: $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig +PHONY += xenconfig +xenconfig: + $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target)) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/xen.config + $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig + define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo ' install - Install kernel using' @@ -270,4 +276,5 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' echo ' kvmconfig - Enable additional options for kvm guest kernel support' + echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' endef diff --git a/arch/x86/configs/xen.config b/arch/x86/configs/xen.config new file mode 100644 index 0000000..fbfbe5c --- /dev/null +++ b/arch/x86/configs/xen.config @@ -0,0 +1,36 @@ +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_PCI_XEN=y +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_TCG_XEN=m +CONFIG_XEN_WDT=m +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=y -- 2.0.0.rc3.18.g00a5b79 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/