From ef7df94353a3cfe0054dfb0edc35a8a710a8fe06 Mon Sep 17 00:00:00 2001 From: Alex Bligh Date: Sun, 27 Nov 2011 17:19:16 +0000 Subject: [PATCH] Make CONFIG_XEN_PLATFORM_PCI=y, CONFIG_XEN_BLKDEV_FRONTEND=y, CONFIG_XEN_NETDEV_FRONTEND=y per LP#886521 Signed-off-by: Alex Bligh --- debian.master/config/amd64/config.flavour.generic | 2 -- debian.master/config/amd64/config.flavour.server | 2 -- debian.master/config/amd64/config.flavour.virtual | 2 -- debian.master/config/armel/config.common.armel | 2 -- debian.master/config/config.common.ubuntu | 4 +++- .../config/i386/config.flavour.generic-pae | 2 -- debian.master/config/i386/config.flavour.virtual | 2 -- 7 files changed, 3 insertions(+), 13 deletions(-) diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic index a3d1808..e7a67ca 100644 --- a/debian.master/config/amd64/config.flavour.generic +++ b/debian.master/config/amd64/config.flavour.generic @@ -16,6 +16,4 @@ 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..a1ba4c5 100644 --- a/debian.master/config/amd64/config.flavour.server +++ b/debian.master/config/amd64/config.flavour.server @@ -16,6 +16,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_XENBUS_FRONTEND=m diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual index ed3931c..d472791 100644 --- a/debian.master/config/amd64/config.flavour.virtual +++ b/debian.master/config/amd64/config.flavour.virtual @@ -16,6 +16,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_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..9cb4869 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5858,7 +5858,9 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_XEN_MAX_DOMAIN_MEMORY=128 CONFIG_XEN_NETDEV_BACKEND=m CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_XEN_PLATFORM_PCI=m +CONFIG_XEN_PLATFORM_PCI=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_PVHVM=y CONFIG_XEN_SAVE_RESTORE=y CONFIG_XEN_SCRUB_PAGES=y diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae index cff8c2a..48aa21e 100644 --- a/debian.master/config/i386/config.flavour.generic-pae +++ b/debian.master/config/i386/config.flavour.generic-pae @@ -19,7 +19,5 @@ 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..f18f514 100644 --- a/debian.master/config/i386/config.flavour.virtual +++ b/debian.master/config/i386/config.flavour.virtual @@ -19,7 +19,5 @@ 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 -- 1.7.0.4