From b3fc572eac2e302e1ce58008a32abbe5838c37b2 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Fri, 22 Jan 2010 14:51:26 +0000
Subject: [PATCH 2/2] UBUNTU: [Config] VIRTIO=y for server/virtual flavours

BugLink: http://bugs.launchpad.net/bugs/494565

Configure CONFIG_VIRTIO_BLK=y and CONFIG_VIRTIO_NET=y so that -virtual
kernels can boot in kvm without need for a ramdisk

Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 .../abi/2.6.32-10.14/amd64/server.modules          |    5 -----
 .../abi/2.6.32-10.14/i386/generic-pae.modules      |    5 -----
 debian.master/config/amd64/config.flavour.generic  |    5 +++++
 debian.master/config/amd64/config.flavour.server   |    5 +++++
 debian.master/config/armel/config.common.armel     |    5 +++++
 debian.master/config/config.common.ubuntu          |    5 -----
 debian.master/config/i386/config.flavour.386       |    5 +++++
 debian.master/config/i386/config.flavour.generic   |    5 +++++
 .../config/i386/config.flavour.generic-pae         |    5 +++++
 debian.master/config/lpia/config.common.lpia       |    5 +++++
 debian.master/sub-flavours/virtual.list            |    6 ------
 11 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/debian.master/abi/2.6.32-10.14/amd64/server.modules b/debian.master/abi/2.6.32-10.14/amd64/server.modules
index 6c01ed4..bd9294c 100644
--- a/debian.master/abi/2.6.32-10.14/amd64/server.modules
+++ b/debian.master/abi/2.6.32-10.14/amd64/server.modules
@@ -2216,13 +2216,8 @@ videobuf-dvb
 videobuf-vmalloc
 videocodec
 videodev
-virtio
 virtio_balloon
-virtio_blk
 virtio_console
-virtio_net
-virtio_pci
-virtio_ring
 virtio-rng
 virtual
 visor
diff --git a/debian.master/abi/2.6.32-10.14/i386/generic-pae.modules b/debian.master/abi/2.6.32-10.14/i386/generic-pae.modules
index 632a69b..ae99d6e 100644
--- a/debian.master/abi/2.6.32-10.14/i386/generic-pae.modules
+++ b/debian.master/abi/2.6.32-10.14/i386/generic-pae.modules
@@ -2406,13 +2406,8 @@ videobuf-dvb
 videobuf-vmalloc
 videocodec
 videodev
-virtio
 virtio_balloon
-virtio_blk
 virtio_console
-virtio_net
-virtio_pci
-virtio_ring
 virtio-rng
 virtual
 visor
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index d417095..1dae2db 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -9,3 +9,8 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index f3543b0..d9bd9be 100644
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -9,3 +9,8 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_RING=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 75e93f2..e7884d0 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -226,6 +226,11 @@ CONFIG_USB=m
 CONFIG_USB_MON=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_DEV is not set
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_VT6656 is not set
 # CONFIG_WAN is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6f14fd7..242591c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4249,13 +4249,8 @@ CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_RING=m
 CONFIG_VIRTUALIZATION=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_VITESSE_PHY=y
diff --git a/debian.master/config/i386/config.flavour.386 b/debian.master/config/i386/config.flavour.386
index c418d0d..97ae98e 100644
--- a/debian.master/config/i386/config.flavour.386
+++ b/debian.master/config/i386/config.flavour.386
@@ -12,5 +12,10 @@ CONFIG_M486=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
 CONFIG_X86_L1_CACHE_SHIFT=4
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index 135508e..7bbd736 100644
--- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic
@@ -12,5 +12,10 @@ CONFIG_M586=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
index e1d53df..adf7a31 100644
--- a/debian.master/config/i386/config.flavour.generic-pae
+++ b/debian.master/config/i386/config.flavour.generic-pae
@@ -12,5 +12,10 @@ CONFIG_M586=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_RING=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index 8af7e35..71bb487 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -255,6 +255,11 @@ CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_MON=y
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_DEV=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VT6656=m
 CONFIG_WAN=y
diff --git a/debian.master/sub-flavours/virtual.list b/debian.master/sub-flavours/virtual.list
index aca70b1..f5cf14d 100644
--- a/debian.master/sub-flavours/virtual.list
+++ b/debian.master/sub-flavours/virtual.list
@@ -4,7 +4,6 @@ drivers/acpi/*
 drivers/ata/ata_generic.ko
 drivers/ata/ata_piix.ko
 drivers/ata/libata.ko
-drivers/block/virtio_blk.ko
 drivers/block/nbd.ko
 drivers/block/loop.ko
 drivers/block/floppy.ko
@@ -54,13 +53,11 @@ drivers/net/slhc.ko
 drivers/net/slip.ko
 drivers/net/tun.ko
 drivers/net/veth.ko
-drivers/net/virtio_net.ko
 drivers/net/xen-netfront.ko
 drivers/parport/parport.ko
 drivers/parport/parport_pc.ko
 drivers/pci/hotplug/acpiphp.ko
 drivers/net/tulip/tulip.ko
-drivers/net/virtio_net.ko
 drivers/scsi/BusLogic.ko
 drivers/scsi/iscsi_tcp.ko
 drivers/scsi/libiscsi.ko
@@ -94,9 +91,6 @@ drivers/video/vga16fb.ko
 drivers/video/vgastate.ko
 drivers/video/xen-fbfront.ko
 drivers/virtio/virtio_balloon.ko
-drivers/virtio/virtio.ko
-drivers/virtio/virtio_pci.ko
-drivers/virtio/virtio_ring.ko
 drivers/watchdog/softdog.ko
 drivers/xen/*
 fs/*
-- 
1.6.5

