From patchwork Thu Dec 1 15:44:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 128709 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 66B7BB6F7F for ; Fri, 2 Dec 2011 02:44:32 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RW8o8-0004lJ-Br; Thu, 01 Dec 2011 15:44:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RW8o3-0004kb-Mc for kernel-team@lists.ubuntu.com; Thu, 01 Dec 2011 15:44:15 +0000 Received: from p5b2e33b7.dip.t-dialin.net ([91.46.51.183] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RW8o3-0005Ec-DE for kernel-team@lists.ubuntu.com; Thu, 01 Dec 2011 15:44:15 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: (config) Change Xen paravirt drivers to be built-in Date: Thu, 1 Dec 2011 16:44:11 +0100 Message-Id: <1322754252-5782-2-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322754252-5782-1-git-send-email-stefan.bader@canonical.com> References: <1322754252-5782-1-git-send-email-stefan.bader@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Alex Bligh This changes CONFIG_XEN_PLATFORM_PCI, CONFIG_XEN_BLKDEV_FRONTEND and CONFIG_XEN_NETDEV_FRONTEND to be built-in instead of modules. The pci platform driver is required by the frontends and it was made an unconditional built-in for 3.2 because of many mis-configurations. The frontend drivers only take effect when a hypervisor (HVM or PVM) is detected (and pull CONFIG_XENBUS_FRONTEND to be built-in). As the PV drivers do not get autoloaded it is better to make them built-in. BugLink: http://bugs.launchpad.net/bugs/886521 Signed-off-by: Alex Bligh [v2: adapted for natty and added modules.ignore to avoid FTBS] Signed-off-by: Stefan Bader --- debian.master/abi/2.6.38-13.52/modules.ignore | 4 ++++ debian.master/config/amd64/config.common.amd64 | 2 ++ debian.master/config/amd64/config.flavour.generic | 3 --- debian.master/config/amd64/config.flavour.server | 3 --- debian.master/config/amd64/config.flavour.virtual | 3 --- debian.master/config/config.common.ubuntu | 3 ++- debian.master/config/i386/config.common.i386 | 2 ++ .../config/i386/config.flavour.generic-pae | 3 --- debian.master/config/i386/config.flavour.virtual | 3 --- 9 files changed, 10 insertions(+), 16 deletions(-) create mode 100644 debian.master/abi/2.6.38-13.52/modules.ignore diff --git a/debian.master/abi/2.6.38-13.52/modules.ignore b/debian.master/abi/2.6.38-13.52/modules.ignore new file mode 100644 index 0000000..86952b8 --- /dev/null +++ b/debian.master/abi/2.6.38-13.52/modules.ignore @@ -0,0 +1,4 @@ +xen-blkfront +xenbus_probe_frontend +xen-netfront +xen-platform-pci diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 6180099..f228c1e 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -442,6 +442,8 @@ CONFIG_X86_INTERNODE_CACHE_SHIFT=7 CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_X86_X2APIC=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_PRIVILEGED_GUEST=y CONFIG_ZONE_DMA32=y CONFIG_ZONE_DMA_FLAG=1 diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic index a3d1808..81a1de0 100644 --- a/debian.master/config/amd64/config.flavour.generic +++ b/debian.master/config/amd64/config.flavour.generic @@ -16,6 +16,3 @@ CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_RING=m -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_XENBUS_FRONTEND=m diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server index fa42131..6b178c3 100644 --- a/debian.master/config/amd64/config.flavour.server +++ b/debian.master/config/amd64/config.flavour.server @@ -16,6 +16,3 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_RING=y -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_XENBUS_FRONTEND=m diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual index ed3931c..ec2e848 100644 --- a/debian.master/config/amd64/config.flavour.virtual +++ b/debian.master/config/amd64/config.flavour.virtual @@ -16,6 +16,3 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_RING=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_XENBUS_FRONTEND=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 5a8a56f..8ee1c56 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5540,11 +5540,12 @@ CONFIG_XEN_GNTDEV=m CONFIG_XEN_KBDDEV_FRONTEND=m CONFIG_XEN_MAX_DOMAIN_MEMORY=128 CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_XEN_PLATFORM_PCI=m +CONFIG_XEN_PLATFORM_PCI=y CONFIG_XEN_PVHVM=y CONFIG_XEN_SAVE_RESTORE=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y CONFIG_XFRM=y CONFIG_XFRM_IPCOMP=m # CONFIG_XFRM_MIGRATE is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 988e953..57540f7 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -442,5 +442,7 @@ CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_SPEEDSTEP_LIB=y # CONFIG_X86_X2APIC is not set +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_ZONE_DMA32 is not set CONFIG_ZONE_DMA_FLAG=1 diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae index 3620b5b..b98813b 100644 --- a/debian.master/config/i386/config.flavour.generic-pae +++ b/debian.master/config/i386/config.flavour.generic-pae @@ -18,7 +18,4 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_RING=y -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_XENBUS_FRONTEND=m diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual index d4ddb92..33756c7 100644 --- a/debian.master/config/i386/config.flavour.virtual +++ b/debian.master/config/i386/config.flavour.virtual @@ -18,7 +18,4 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_RING=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_XENBUS_FRONTEND=y