# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 272a0a971ca3ed650fc3a74758f6862b3883bf9b
# Parent 40c23921e7295650305c4e4db2480756e9b3e10c
Add -xen buildconfig for ia64 and tweak CONFIG_VT setup to avoid
initializing on domUs. Remove CONFIG_IDE_GENERIC as this is
unnecessary on ia64 systems (no ISA IDE controllers) and causes long
timeouts booting domU.
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
diff -r 40c23921e729 -r 272a0a971ca3 buildconfigs/linux-defconfig_xen0_ia64
--- a/buildconfigs/linux-defconfig_xen0_ia64 Mon Mar 27 17:03:03 2006
+++ b/buildconfigs/linux-defconfig_xen0_ia64 Tue Mar 28 08:57:48 2006
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc3-xen0
-# Thu Feb 16 13:20:46 2006
+# Linux kernel version: 2.6.16-xen0
+# Mon Mar 27 14:46:03 2006
#
#
@@ -95,8 +95,7 @@
CONFIG_XEN_PRIVILEGED_GUEST=y
CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_VT=y
-CONFIG_VT=y
+CONFIG_XEN_BLKDEV_BACKEND=y
CONFIG_XEN_SYSFS=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_DMA_IS_DMA32=y
@@ -378,7 +377,7 @@
#
# IDE chipset support/bugfixes
#
-CONFIG_IDE_GENERIC=y
+# CONFIG_IDE_GENERIC is not set
CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_IDEPCI_SHARE_IRQ is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -706,6 +705,7 @@
#
# Character devices
#
+CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_NONSTANDARD=y
@@ -1252,11 +1252,7 @@
# CONFIG_INFINIBAND is not set
#
-# SN Devices
-#
-
-#
-# EDAC - error detection and reporting (RAS)
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
#
#
diff -r 40c23921e729 -r 272a0a971ca3 buildconfigs/linux-defconfig_xenU_ia64
--- a/buildconfigs/linux-defconfig_xenU_ia64 Mon Mar 27 17:03:03 2006
+++ b/buildconfigs/linux-defconfig_xenU_ia64 Tue Mar 28 08:57:48 2006
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc3-xenU
-# Thu Feb 16 13:47:59 2006
+# Linux kernel version: 2.6.16-xenU
+# Mon Mar 27 14:01:13 2006
#
#
@@ -92,8 +92,7 @@
CONFIG_XEN_PRIVILEGED_GUEST=y
CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_BLKDEV_FRONTEND=y
-# CONFIG_XEN_VT is not set
-# CONFIG_VT is not set
+CONFIG_XEN_BLKDEV_BACKEND=y
CONFIG_XEN_SYSFS=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_DMA_IS_DMA32=y
@@ -607,6 +606,9 @@
#
# Character devices
#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set
#
@@ -863,6 +865,13 @@
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
#
# Logo configuration
@@ -1122,11 +1131,7 @@
# CONFIG_INFINIBAND is not set
#
-# SN Devices
-#
-
-#
-# EDAC - error detection and reporting (RAS)
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
#
#
diff -r 40c23921e729 -r 272a0a971ca3 linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig Mon Mar 27 17:03:03 2006
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig Tue Mar 28 08:57:48 2006
@@ -83,19 +83,6 @@
depends on XEN
bool
default y
-
-config XEN_VT
- bool "Override for turning on CONFIG_VT for domU"
- default y
- help
- Hack to turn off CONFIG_VT for domU
-
-config VT
- bool
- default y if XEN && XEN_VT
- default n if XEN && !XEN_VT
- help
- Hack to turn off CONFIG_VT for domU
config XEN_SYSFS
bool "Export Xen attributes in sysfs"
diff -r 40c23921e729 -r 272a0a971ca3
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Mon Mar 27 17:03:03 2006
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Tue Mar 28 08:57:48 2006
@@ -506,6 +506,22 @@
conswitchp = &vga_con;
# endif
}
+#ifdef CONFIG_XEN
+ if (running_on_xen) {
+ extern shared_info_t *HYPERVISOR_shared_info;
+
+ /* xen_start_info isn't setup yet, get the flags manually */
+ if (HYPERVISOR_shared_info->arch.flags & SIF_INITDOMAIN) {
+ if (!(HYPERVISOR_shared_info->arch.flags &
SIF_PRIVILEGED))
+ panic("Xen granted us console access "
+ "but not privileged status");
+ } else {
+ extern int console_use_vt;
+ conswitchp = NULL;
+ console_use_vt = 0;
+ }
+ }
+#endif
#endif
/* enable IA-64 Machine Check Abort Handling unless disabled */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home