From 4ea038575eb6ba5ade33ccfd70a35a5c22b7d993 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Tue, 12 Aug 2008 20:54:50 +0000
Subject: [PATCH] Enable Xen in amd64 kernel images.

Also explicitly list some Xen symbols in the i386 config which were
simply taken by default before, no actual change to the configuration.

svn path=/dists/trunk/linux-2.6/; revision=12051
---
 debian/changelog           |  3 +++
 debian/config/amd64/config | 18 ++++++++++++++++++
 debian/config/i386/config  |  9 +++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eabec3418..66694c1b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ linux-2.6 (2.6.27~rc2-1~experimental.1) UNRELEASED; urgency=low
   [ Martin Michlmayr ]
   * [mips/r4k-ip22, mips/sb1-bcm91250a] Don't build in ISO9660.
 
+  [ Ian Campbell ]
+  * [x86]: Enable Xen guest support in amd64 flavour.
+
  -- maximilian attems <maks@debian.org>  Wed, 30 Jul 2008 18:23:09 +0200
 
 linux-2.6 (2.6.26-1~experimental.1) UNRELEASED; urgency=low
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 81ece141a..a7258aa0c 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -92,6 +92,13 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 
+##
+## file: arch/x86/xen/Kconfig
+##
+CONFIG_XEN=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=32
+CONFIG_XEN_SAVE_RESTORE=y
+
 ##
 ## file: crypto/Kconfig
 ##
@@ -176,6 +183,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_VIRTIO_BLK=m
 
 ##
@@ -242,6 +250,7 @@ CONFIG_STALDRV=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
+CONFIG_HVC_XEN=y
 CONFIG_NVRAM=m
 CONFIG_RTC=y
 CONFIG_GEN_RTC=m
@@ -506,6 +515,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
+CONFIG_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/gameport/Kconfig
@@ -931,6 +941,7 @@ CONFIG_R8169=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -1341,6 +1352,7 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_VIRTUAL=m
+CONFIG_XEN_FBDEV_FRONTEND=y
 
 ##
 ## file: drivers/video/backlight/Kconfig
@@ -1403,6 +1415,12 @@ CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
 CONFIG_USBPCWATCHDOG=m
 
+##
+## file: drivers/xen/Kconfig
+##
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+
 ##
 ## file: fs/partitions/Kconfig
 ##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index ed1374832..fb8f5d1aa 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -158,6 +158,8 @@ CONFIG_LGUEST_GUEST=y
 ## file: arch/x86/xen/Kconfig
 ##
 CONFIG_XEN=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+CONFIG_XEN_SAVE_RESTORE=y
 
 ##
 ## file: crypto/Kconfig
@@ -610,6 +612,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
+CONFIG_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/gameport/Kconfig
@@ -1666,6 +1669,12 @@ CONFIG_USBPCWATCHDOG=m
 ##
 CONFIG_BINFMT_AOUT=m
 
+##
+## file: drivers/xen/Kconfig
+##
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+
 ##
 ## file: fs/partitions/Kconfig
 ##