ia64/xen-unstable

changeset 9462:272a0a971ca3

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@hp.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Mar 28 09:57:48 2006 +0100 (2006-03-28)
parents 40c23921e729
children 47dda4fa5d11
files buildconfigs/linux-defconfig_xen0_ia64 buildconfigs/linux-defconfig_xenU_ia64 linux-2.6-xen-sparse/arch/ia64/Kconfig linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Mon Mar 27 18:03:03 2006 +0100
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Tue Mar 28 09:57:48 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# Linux kernel version: 2.6.16-rc3-xen0
     1.7 -# Thu Feb 16 13:20:46 2006
     1.8 +# Linux kernel version: 2.6.16-xen0
     1.9 +# Mon Mar 27 14:46:03 2006
    1.10  #
    1.11  
    1.12  #
    1.13 @@ -95,8 +95,7 @@ CONFIG_ARCH_XEN=y
    1.14  CONFIG_XEN_PRIVILEGED_GUEST=y
    1.15  CONFIG_XEN_BLKDEV_GRANT=y
    1.16  CONFIG_XEN_BLKDEV_FRONTEND=y
    1.17 -CONFIG_XEN_VT=y
    1.18 -CONFIG_VT=y
    1.19 +CONFIG_XEN_BLKDEV_BACKEND=y
    1.20  CONFIG_XEN_SYSFS=y
    1.21  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
    1.22  CONFIG_DMA_IS_DMA32=y
    1.23 @@ -378,7 +377,7 @@ CONFIG_BLK_DEV_IDESCSI=y
    1.24  #
    1.25  # IDE chipset support/bugfixes
    1.26  #
    1.27 -CONFIG_IDE_GENERIC=y
    1.28 +# CONFIG_IDE_GENERIC is not set
    1.29  CONFIG_BLK_DEV_IDEPCI=y
    1.30  # CONFIG_IDEPCI_SHARE_IRQ is not set
    1.31  # CONFIG_BLK_DEV_OFFBOARD is not set
    1.32 @@ -706,6 +705,7 @@ CONFIG_GAMEPORT=y
    1.33  #
    1.34  # Character devices
    1.35  #
    1.36 +CONFIG_VT=y
    1.37  CONFIG_VT_CONSOLE=y
    1.38  CONFIG_HW_CONSOLE=y
    1.39  CONFIG_SERIAL_NONSTANDARD=y
    1.40 @@ -1252,11 +1252,7 @@ CONFIG_USB_MON=y
    1.41  # CONFIG_INFINIBAND is not set
    1.42  
    1.43  #
    1.44 -# SN Devices
    1.45 -#
    1.46 -
    1.47 -#
    1.48 -# EDAC - error detection and reporting (RAS)
    1.49 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
    1.50  #
    1.51  
    1.52  #
     2.1 --- a/buildconfigs/linux-defconfig_xenU_ia64	Mon Mar 27 18:03:03 2006 +0100
     2.2 +++ b/buildconfigs/linux-defconfig_xenU_ia64	Tue Mar 28 09:57:48 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6 -# Linux kernel version: 2.6.16-rc3-xenU
     2.7 -# Thu Feb 16 13:47:59 2006
     2.8 +# Linux kernel version: 2.6.16-xenU
     2.9 +# Mon Mar 27 14:01:13 2006
    2.10  #
    2.11  
    2.12  #
    2.13 @@ -92,8 +92,7 @@ CONFIG_ARCH_XEN=y
    2.14  CONFIG_XEN_PRIVILEGED_GUEST=y
    2.15  CONFIG_XEN_BLKDEV_GRANT=y
    2.16  CONFIG_XEN_BLKDEV_FRONTEND=y
    2.17 -# CONFIG_XEN_VT is not set
    2.18 -# CONFIG_VT is not set
    2.19 +CONFIG_XEN_BLKDEV_BACKEND=y
    2.20  CONFIG_XEN_SYSFS=y
    2.21  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
    2.22  CONFIG_DMA_IS_DMA32=y
    2.23 @@ -607,6 +606,9 @@ CONFIG_SERIO=y
    2.24  #
    2.25  # Character devices
    2.26  #
    2.27 +CONFIG_VT=y
    2.28 +CONFIG_VT_CONSOLE=y
    2.29 +CONFIG_HW_CONSOLE=y
    2.30  # CONFIG_SERIAL_NONSTANDARD is not set
    2.31  
    2.32  #
    2.33 @@ -865,6 +867,13 @@ CONFIG_FB_RADEON_DEBUG=y
    2.34  # CONFIG_FB_VIRTUAL is not set
    2.35  
    2.36  #
    2.37 +# Console display driver support
    2.38 +#
    2.39 +CONFIG_VGA_CONSOLE=y
    2.40 +CONFIG_DUMMY_CONSOLE=y
    2.41 +# CONFIG_FRAMEBUFFER_CONSOLE is not set
    2.42 +
    2.43 +#
    2.44  # Logo configuration
    2.45  #
    2.46  CONFIG_LOGO=y
    2.47 @@ -1122,11 +1131,7 @@ CONFIG_USB_MON=y
    2.48  # CONFIG_INFINIBAND is not set
    2.49  
    2.50  #
    2.51 -# SN Devices
    2.52 -#
    2.53 -
    2.54 -#
    2.55 -# EDAC - error detection and reporting (RAS)
    2.56 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
    2.57  #
    2.58  
    2.59  #
     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Mon Mar 27 18:03:03 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Tue Mar 28 09:57:48 2006 +0100
     3.3 @@ -84,19 +84,6 @@ config XEN_BLKDEV_BACKEND
     3.4  	bool
     3.5  	default y
     3.6  
     3.7 -config XEN_VT
     3.8 -	bool "Override for turning on CONFIG_VT for domU"
     3.9 -	default y
    3.10 -	help
    3.11 -	  Hack to turn off CONFIG_VT for domU
    3.12 -
    3.13 -config VT
    3.14 -	bool
    3.15 -	default y if XEN && XEN_VT
    3.16 -	default n if XEN && !XEN_VT
    3.17 -	help
    3.18 -	  Hack to turn off CONFIG_VT for domU
    3.19 -
    3.20  config XEN_SYSFS
    3.21  	bool "Export Xen attributes in sysfs"
    3.22  	depends on XEN && SYSFS
     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Mon Mar 27 18:03:03 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Tue Mar 28 09:57:48 2006 +0100
     4.3 @@ -506,6 +506,22 @@ setup_arch (char **cmdline_p)
     4.4  			conswitchp = &vga_con;
     4.5  # endif
     4.6  	}
     4.7 +#ifdef CONFIG_XEN
     4.8 +	if (running_on_xen) {
     4.9 +		extern shared_info_t *HYPERVISOR_shared_info;
    4.10 +
    4.11 +		/* xen_start_info isn't setup yet, get the flags manually */
    4.12 +		if (HYPERVISOR_shared_info->arch.flags & SIF_INITDOMAIN) {
    4.13 +			if (!(HYPERVISOR_shared_info->arch.flags & SIF_PRIVILEGED))
    4.14 +				panic("Xen granted us console access "
    4.15 +				      "but not privileged status");
    4.16 +		} else {
    4.17 +			extern int console_use_vt;
    4.18 +			conswitchp = NULL;
    4.19 +			console_use_vt = 0;
    4.20 +		}
    4.21 +	}
    4.22 +#endif
    4.23  #endif
    4.24  
    4.25  	/* enable IA-64 Machine Check Abort Handling unless disabled */