Skip to contentSkip to conversation

fix -xen build on ia64

PATCH New Alex Williamson 1 participant 1 message Mar 27, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix -xen build on ia64

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. Please apply. Thanks,

Alex

Signature · 1 line
Alex Williamson                             HP Linux & Open Source Lab

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.

linux-2.6-xen-sparse/arch/ia64/Kconfig +0 -13
diff -r 8b5a752167a1 linux-2.6-xen-sparse/arch/ia64/Kconfig
@@ -83,19 +83,6 @@ config XEN_BLKDEV_BACKEND
 	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"
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +16 -0
diff -r 8b5a752167a1 linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
@@ -506,6 +506,22 @@ setup_arch (char **cmdline_p)
 			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 */
buildconfigs/linux-defconfig_xenU_ia64 +14 -9
diff -r 8b5a752167a1 buildconfigs/linux-defconfig_xenU_ia64
@@ -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_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 @@ CONFIG_SERIO=y
 #
 # 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_RADEON_DEBUG=y
 # 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_USB_MON=y
 # CONFIG_INFINIBAND is not set
 
 #
-# SN Devices
-#
-
-#
-# EDAC - error detection and reporting (RAS)
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 #
 
 #
buildconfigs/linux-defconfig_xen0_ia64 +6 -10
diff -r 8b5a752167a1 buildconfigs/linux-defconfig_xen0_ia64
@@ -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_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 @@ CONFIG_BLK_DEV_IDESCSI=y
 #
 # 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 @@ CONFIG_GAMEPORT=y
 #
 # Character devices
 #
+CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_NONSTANDARD=y
@@ -1252,11 +1252,7 @@ CONFIG_USB_MON=y
 # CONFIG_INFINIBAND is not set
 
 #
-# SN Devices
-#
-
-#
-# EDAC - error detection and reporting (RAS)
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 #
 
 #
buildconfigs/linux-defconfig_xen_ia64 new file +1523 -0

1,523 lines not on this page · raw message

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel