Message ID | 1320855671-26952-1-git-send-email-stefan.bader@canonical.com |
---|---|
State | New |
Headers | show |
On Wed, 2011-11-09 at 17:21 +0100, Stefan Bader wrote: > Not sure why updateconfigs moves blkfront and netfront into > the arch common, while the xenbus frontend (which is changed > implicitly when doing the editconfigs) makes it to common. I think this is because CONFIG_XEN_BLKDEV_FRONTEND and CONFIG_XEN_NETDEV_FRONTEND both depend on CONFIG_XEN which is only available on x86 and ia64. > PS: There seems to be a seccomp filter change pending... Thanks. We dropped the seccomp patches when we rebased to v3.2-rc1. I'll get this cleaned up. > From ba8961db758cfd62a2ad29822d4a8c8455c3552f Mon Sep 17 00:00:00 2001 > From: Stefan Bader <stefan.bader@canonical.com> > Date: Wed, 9 Nov 2011 16:11:59 +0000 > Subject: [PATCH] UBUNTU: (configs) Built-in xen-netfront and xen-blkfront > > As discussed at UDS-P, building those paravirt drivers in will > simplify their usage. For Xen guests those could be considered > as boot-essential. > > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Applied to Precise master-next. Thanks, Leann > --- > debian.master/config/amd64/config.common.amd64 | 2 ++ > debian.master/config/amd64/config.flavour.generic | 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 --- > 7 files changed, 5 insertions(+), 14 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index e664b9d..e041e44 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -334,6 +334,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_ZLIB_DEFLATE=m > 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 7f31bf6..65b16fc 100644 > --- a/debian.master/config/amd64/config.flavour.generic > +++ b/debian.master/config/amd64/config.flavour.generic > @@ -13,6 +13,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.virtual b/debian.master/config/amd64/config.flavour.virtual > index 73a3e89..8581f80 100644 > --- a/debian.master/config/amd64/config.flavour.virtual > +++ b/debian.master/config/amd64/config.flavour.virtual > @@ -13,6 +13,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 0fda5d2..a6419a6 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -6039,6 +6037,7 @@ CONFIG_XEN_SELFBALLOONING=y > CONFIG_XEN_SYS_HYPERVISOR=y > CONFIG_XEN_TMEM=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.common.i386 b/debian.master/config/i386/config.common.i386 > index da0e2b4..b3b7461 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -345,6 +345,8 @@ 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_ZLIB_DEFLATE=m > # 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 94582cb..0f1a9d1 100644 > --- a/debian.master/config/i386/config.flavour.generic-pae > +++ b/debian.master/config/i386/config.flavour.generic-pae > @@ -4,6 +4,3 @@ > CONFIG_INTEL_IDLE=y > CONFIG_PHYSICAL_ALIGN=0x1000000 > CONFIG_PHYSICAL_START=0x1000000 > -CONFIG_XEN_BLKDEV_FRONTEND=m > -CONFIG_XEN_NETDEV_FRONTEND=m > -CONFIG_XEN_XENBUS_FRONTEND=m > diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual > index e200b5f..8a4e8b6 100644 > --- a/debian.master/config/i386/config.flavour.virtual > +++ b/debian.master/config/i386/config.flavour.virtual > @@ -4,6 +4,3 @@ > # CONFIG_INTEL_IDLE is not set > CONFIG_PHYSICAL_ALIGN=0x100000 > CONFIG_PHYSICAL_START=0x100000 > -CONFIG_XEN_BLKDEV_FRONTEND=y > -CONFIG_XEN_NETDEV_FRONTEND=y > -CONFIG_XEN_XENBUS_FRONTEND=y > -- > 1.7.5.4 > >
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e664b9d..e041e44 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -334,6 +334,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_ZLIB_DEFLATE=m 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 7f31bf6..65b16fc 100644 --- a/debian.master/config/amd64/config.flavour.generic +++ b/debian.master/config/amd64/config.flavour.generic @@ -13,6 +13,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.virtual b/debian.master/config/amd64/config.flavour.virtual index 73a3e89..8581f80 100644 --- a/debian.master/config/amd64/config.flavour.virtual +++ b/debian.master/config/amd64/config.flavour.virtual @@ -13,6 +13,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 0fda5d2..a6419a6 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6039,6 +6037,7 @@ CONFIG_XEN_SELFBALLOONING=y CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_TMEM=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.common.i386 b/debian.master/config/i386/config.common.i386 index da0e2b4..b3b7461 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -345,6 +345,8 @@ 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_ZLIB_DEFLATE=m # 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 94582cb..0f1a9d1 100644 --- a/debian.master/config/i386/config.flavour.generic-pae +++ b/debian.master/config/i386/config.flavour.generic-pae @@ -4,6 +4,3 @@ CONFIG_INTEL_IDLE=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_PHYSICAL_START=0x1000000 -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_XENBUS_FRONTEND=m diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual index e200b5f..8a4e8b6 100644 --- a/debian.master/config/i386/config.flavour.virtual +++ b/debian.master/config/i386/config.flavour.virtual @@ -4,6 +4,3 @@ # CONFIG_INTEL_IDLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_PHYSICAL_START=0x100000 -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_XENBUS_FRONTEND=y