diff mbox

UBUNTU: (config) Change Xen paravirt drivers to be built-in

Message ID 1322754252-5782-3-git-send-email-stefan.bader@canonical.com
State New
Headers show

Commit Message

Stefan Bader Dec. 1, 2011, 3:44 p.m. UTC 
From: Alex Bligh <alex@alex.org.uk>

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 <alex@alex.org.uk>
[v2 added modules.ignore to avoid FTBS]
Signed-off-by: Stefan Bader <smb@canonical.com>
---
 debian.master/abi/3.0.0-14.23/modules.ignore       |    4 ++++
 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/armel/config.common.armel     |    2 --
 debian.master/config/config.common.ubuntu          |    5 ++++-
 .../config/i386/config.flavour.generic-pae         |    3 ---
 debian.master/config/i386/config.flavour.virtual   |    3 ---
 8 files changed, 8 insertions(+), 18 deletions(-)
 create mode 100644 debian.master/abi/3.0.0-14.23/modules.ignore
diff mbox

Patch

diff --git a/debian.master/abi/3.0.0-14.23/modules.ignore b/debian.master/abi/3.0.0-14.23/modules.ignore
new file mode 100644
index 0000000..86952b8
--- /dev/null
+++ b/debian.master/abi/3.0.0-14.23/modules.ignore
@@ -0,0 +1,4 @@ 
+xen-blkfront
+xenbus_probe_frontend
+xen-netfront
+xen-platform-pci
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/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index d10549b..5485a77 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -311,6 +311,4 @@  CONFIG_W35UND=m
 # CONFIG_WM8350_WATCHDOG is not set
 # CONFIG_X25_ASY is not set
 # CONFIG_X86_X2APIC is not set
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 35a58a5..f8304b6 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5847,6 +5847,7 @@  CONFIG_XENFS=m
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_COMPAT_XENFS=y
 # CONFIG_XEN_DEBUG is not set
 # CONFIG_XEN_DEBUG_FS is not set
@@ -5857,13 +5858,15 @@  CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_XEN_NETDEV_FRONTEND=y
 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_WDT=m
+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.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
index cff8c2a..052bb96 100644
--- a/debian.master/config/i386/config.flavour.generic-pae
+++ b/debian.master/config/i386/config.flavour.generic-pae
@@ -19,7 +19,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 54e78a3..8c7354b 100644
--- a/debian.master/config/i386/config.flavour.virtual
+++ b/debian.master/config/i386/config.flavour.virtual
@@ -19,7 +19,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