From b531d002621336f533c23dfd3f8665fb17861c55 Mon Sep 17 00:00:00 2001 From: Chris Patterson Date: Wed, 9 Oct 2013 22:22:49 -0400 Subject: linux-yocto/xen: update fragment to support both dom0 and typical xen guests. Updated linux kernel fragment to match defaults as defined in the 3.10 kernel's Kconfig files. If defaults were not specified, modules were were used unless required by another built-in option. As such, The core frontend drivers are included by default and the backend drivers are built as modules. This allows privileged, PV, HVM, and PVHVM guests to work properly without additional kernel configuration or modules required in initramfs (from a Xen support perspective). This also removes CONFIG_KVM_GUEST which was erroneously included previously. Signed-off-by: Chris Patterson Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-yocto/xen.cfg | 13 ++++++------- recipes-kernel/linux/linux-yocto/xen.scc | 4 ++-- recipes-kernel/linux/linux-yocto_3.10.bbappend | 2 +- recipes-kernel/linux/linux-yocto_3.4.bbappend | 2 +- recipes-kernel/linux/linux-yocto_3.8.bbappend | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/recipes-kernel/linux/linux-yocto/xen.cfg b/recipes-kernel/linux/linux-yocto/xen.cfg index e7d774e8..4e796b95 100644 --- a/recipes-kernel/linux/linux-yocto/xen.cfg +++ b/recipes-kernel/linux/linux-yocto/xen.cfg @@ -15,15 +15,14 @@ CONFIG_XEN_PRIVILEGED_GUEST=y CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y -CONFIG_KVM_GUEST=y CONFIG_PARAVIRT_CLOCK=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_PCI_XEN=y -CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_XEN_PCIDEV_FRONTEND=y CONFIG_SYS_HYPERVISOR=y -CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_NETDEV_BACKEND=m CONFIG_INPUT_MISC=y CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y @@ -39,9 +38,9 @@ CONFIG_FB_DEFERRED_IO=y CONFIG_XEN_FBDEV_FRONTEND=y CONFIG_XEN_BALLOON=y CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_DEV_EVTCHN=y CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m +CONFIG_XENFS=y CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_XENBUS_FRONTEND=y @@ -49,7 +48,7 @@ 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_PRIVCMD=y CONFIG_XEN_ACPI_PROCESSOR=m CONFIG_XEN_MCE_LOG=y CONFIG_XEN_HAVE_PVMMU=y diff --git a/recipes-kernel/linux/linux-yocto/xen.scc b/recipes-kernel/linux/linux-yocto/xen.scc index 6c68bda7..b588e5df 100644 --- a/recipes-kernel/linux/linux-yocto/xen.scc +++ b/recipes-kernel/linux/linux-yocto/xen.scc @@ -1,4 +1,4 @@ -define KFEATURE_DESCRIPTION "Xen Dom0 Support" -define KFEATURE_COMPATIBILITY board +define KFEATURE_DESCRIPTION "Xen Kernel Support" +define KFEATURE_COMPATIBILITY arch kconf non-hardware xen.cfg diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend index cc7fd98b..c029c05e 100644 --- a/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -15,5 +15,5 @@ module_autoload_kvm-intel = "kvm-intel" # aufs kernel support required for xen-image-minimal KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" -# xen dom0 kernel support +# xen kernel support SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" diff --git a/recipes-kernel/linux/linux-yocto_3.4.bbappend b/recipes-kernel/linux/linux-yocto_3.4.bbappend index 448d57f7..bf84725a 100644 --- a/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -12,5 +12,5 @@ module_autoload_kvm = "kvm" module_autoload_kvm-amd = "kvm-amd" module_autoload_kvm-intel = "kvm-intel" -# xen dom0 kernel support +# xen kernel support SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" diff --git a/recipes-kernel/linux/linux-yocto_3.8.bbappend b/recipes-kernel/linux/linux-yocto_3.8.bbappend index cc7fd98b..c029c05e 100644 --- a/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -15,5 +15,5 @@ module_autoload_kvm-intel = "kvm-intel" # aufs kernel support required for xen-image-minimal KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" -# xen dom0 kernel support +# xen kernel support SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" -- cgit v1.2.3-54-g00ecf