From 26b6f8d5908e1d988e7e63a0bdcdb75a2229728d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Sun, 27 Nov 2011 09:43:56 +0000
Subject: [PATCH] - enable xen (only options that don't impact performance when
 running on bare metal)

Changed files:
    kernel-multiarch.config -> 1.81
    kernel-x86.config -> 1.37
---
 kernel-multiarch.config | 28 +++++++++++++++++++++++++++-
 kernel-x86.config       | 24 +++++++++++++++++-------
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index c81cd889..c815012e 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -325,7 +325,6 @@ FIRMWARE_IN_KERNEL all=n
 EXTRA_FIRMWARE all=""
 DEBUG_DRIVER all=n
 DEBUG_DEVRES all=n
-SYS_HYPERVISOR all=n
 #- file drivers/base/regmap/Kconfig goes here
 
 #-
@@ -370,6 +369,8 @@ CDROM_PKTCDVD_WCACHE all=y
 ATA_OVER_ETH all=m
 SUNVDC sparc64=m
 #- file drivers/s390/block/Kconfig goes here
+XEN_BLKDEV_FRONTEND all=m
+XEN_BLKDEV_BACKEND all=m
 VIRTIO_BLK all=m
 BLK_DEV_HD all=n
 BLK_DEV_RBD all=m
@@ -1367,6 +1368,7 @@ INPUT_ADXL34X_I2C all=m
 INPUT_ADXL34X_SPI all=m
 INPUT_CMA3000 all=m
 INPUT_CMA3000_I2C all=m
+INPUT_XEN_KBDDEV_FRONTEND all=m
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -2943,6 +2945,8 @@ BNA all=m
 #- file drivers/ieee802154/Kconfig goes here
 #- file drivers/s390/net/Kconfig goes here
 #- file drivers/net/caif/Kconfig goes here
+XEN_NETDEV_FRONTEND all=m
+XEN_NETDEV_BACKEND all=m
 ISERIES_VETH ppc64=n
 RIONET all=m
 RIONET_TX_SIZE all=128
@@ -3579,6 +3583,7 @@ ARCH_SUPPORTS_MSI ppc=y sparc=n sparc64=y
 PCI_MSI all=y sparc64=n
 PCI_DEBUG all=n
 PCI_STUB all=m
+XEN_PCIDEV_FRONTEND all=m
 HT_IRQ i386=y x86_64=y
 PCI_IOV all=y
 PCI_LABEL all=y
@@ -5012,6 +5017,7 @@ HVC_CONSOLE ppc64=n
 HVC_ISERIES ppc64=n
 HVC_RTAS ppc=y ppc64=y
 HVC_BEAT ppc64=n
+HVC_XEN all=y
 HVC_UDBG all=n
 HVCS ppc64=n
 
@@ -5523,6 +5529,7 @@ FB_IBM_GXT4500 ppc=m ppc64=m
 FB_PS3 ppc64=y
 FB_PS3_DEFAULT_SIZE_M ppc64=18
 FB_VIRTUAL all=n
+XEN_FBDEV_FRONTEND all=m
 FB_METRONOME all=m
 FB_MB862XX all=m
 FB_MB862XX_PCI_GDC all=y
@@ -5704,6 +5711,7 @@ MPC5200_WDT ppc=m
 WATCHDOG_RTAS ppc=m ppc64=m
 WATCHDOG_CP1XXX sparc64=m
 WATCHDOG_RIO sparc64=m
+XEN_WDT all=m
 #- ISA-based Watchdog Cards
 PCWATCHDOG alpha=m i386=m
 MIXCOMWD alpha=m i386=m
@@ -5714,6 +5722,23 @@ WDTPCI all=m
 #- USB-based Watchdog Cards
 USBPCWATCHDOG all=m
 
+#-
+#- *** FILE: drivers/xen/Kconfig ***
+#-
+XEN_BALLOON all=y
+XEN_SELFBALLOONING all=y
+XEN_BALLOON_MEMORY_HOTPLUG all=y
+XEN_SCRUB_PAGES all=y
+XEN_DEV_EVTCHN all=m
+XEN_BACKEND all=y
+XENFS all=m
+XEN_COMPAT_XENFS all=y
+XEN_SYS_HYPERVISOR all=y
+XEN_GNTDEV all=m
+XEN_GRANT_DEV_ALLOC all=m
+XEN_PLATFORM_PCI all=m
+XEN_PCIDEV_BACKEND all=m
+
 #-
 #- *** FILE: fs/9p/Kconfig ***
 #-
@@ -7448,6 +7473,7 @@ SAMPLES all=n
 #-
 #- *** FILE: security/Kconfig ***
 #-
+#- file grsecurity/Kconfig goes here
 KEYS all=y
 TRUSTED_KEYS all=m
 ENCRYPTED_KEYS all=m
diff --git a/kernel-x86.config b/kernel-x86.config
index 3cab5494..5f9d9866 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -30,10 +30,15 @@ X86_VISWS i386=n
 X86_SUMMIT i386=n
 X86_ES7000 i386=n
 SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
-PARAVIRT_GUEST x86=n
+PARAVIRT_GUEST x86=y
+PARAVIRT_TIME_ACCOUNTING x86=y
 #- file arch/x86/xen/Kconfig goes here
+KVM_CLOCK x86=y
+KVM_GUEST x86=y
 #- file arch/x86/lguest/Kconfig goes here
 PARAVIRT i386=y
+PARAVIRT_SPINLOCKS x86=n
+PARAVIRT_DEBUG x86=n
 NO_BOOTMEM x86=y
 MEMTEST x86=n
 #- file arch/x86/Kconfig.cpu goes here
@@ -42,8 +47,6 @@ DMI x86=y
 GART_IOMMU x86_64=y
 CALGARY_IOMMU x86_64=y
 CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
-AMD_IOMMU x86_64=y
-AMD_IOMMU_STATS x86_64=n
 MAXSMP i386=n x86_64=n
 NR_CPUS x86=32
 SCHED_SMT x86=y
@@ -119,8 +122,6 @@ PCI_GOMMCONFIG i386=n
 PCI_GODIRECT i386=n
 PCI_GOANY i386=y
 PCI_MMCONFIG x86=y
-DMAR x86=n
-INTR_REMAP x86_64=n
 #- file drivers/pci/pcie/Kconfig goes here
 #- file drivers/pci/Kconfig goes here
 ISA i386=y
@@ -223,12 +224,13 @@ KVM_AMD x86=m
 KVM_MMU_AUDIT x86=y
 #- file drivers/vhost/Kconfig goes here
 #- file drivers/lguest/Kconfig goes here
-#- file drivers/virtio/Kconfig goes here
 
 #-
 #- *** FILE: arch/x86/xen/Kconfig ***
 #-
-XEN i386=n
+XEN x86=y
+XEN_DEBUG_FS x86=n
+XEN_DEBUG x86=n
 
 #-
 #- *** FILE: drivers/cpufreq/Kconfig.x86 ***
@@ -251,6 +253,14 @@ X86_E_POWERSAVER i386=m
 #- shared options
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 
+#-
+#- *** FILE: drivers/iommu/Kconfig ***
+#-
+AMD_IOMMU x86_64=y
+AMD_IOMMU_STATS x86_64=n
+DMAR x86=n
+INTR_REMAP x86_64=n
+
 #-
 #- *** FILE: kernel/irq/Kconfig ***
 #-
-- 
2.44.0