bitkeeper revision 1.1148 (411131f0ZrZwSSvmzkGHMRh1xnTq_Q)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-26dom0

.rootkeys

@@ -170,6 +170,7 @@
 40f562392LBhwmOxVPsYdkYXMxI_ZQ linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c
 3f68905c5eiA-lBMQSvXLMWS1ikDEA linux-2.6.7-xen-sparse/arch/xen/kernel/xen_proc.c
 4108f5c1WfTIrs0HZFeV39sttekCTw linux-2.6.7-xen-sparse/drivers/char/mem.c
+4111308bZAIzwf_Kzu6x1TZYZ3E0_Q linux-2.6.7-xen-sparse/drivers/char/tty_io.c
 40f56239Dp_vMTgz8TEbvo1hjHGc3w linux-2.6.7-xen-sparse/drivers/xen/Makefile
 410d0893otFGghmv4dUXDUBBdY5aIA linux-2.6.7-xen-sparse/drivers/xen/blkback/Makefile
 4087cf0d1XgMkooTZAiJS6NrcpLQNQ linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c

linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c

@@ -1243,12 +1243,15 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
 	} else {
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+		extern const struct consw xennull_con;
+		extern int console_use_vt;
 #if defined(CONFIG_VGA_CONSOLE)
 		/* disable VGA driver */
 		ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
 #endif
-#if defined(CONFIG_DUMMY_CONSOLE)
-		conswitchp = &dummy_con;
+		conswitchp = &xennull_con;
+		console_use_vt = 0;
 #endif
 	}
 }

linux-2.6.7-xen-sparse/drivers/xen/console/console.c

@@ -164,14 +164,7 @@ void xen_console_init(void)
     else
     {
         if ( xc_mode == XC_DEFAULT )
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) && defined(CONFIG_VT)
-            /* On a kernel built with VT support, default to serial
-             * console because the VT driver has already allocated the
-             * /dev/tty device nodes */
-            xc_mode = XC_SERIAL;
-#else
             xc_mode = XC_TTY;
-#endif
         kcons_info.write = kcons_write;
     }
 
@@ -597,6 +590,44 @@ static struct tty_operations xencons_ops = {
     .unthrottle = xencons_unthrottle,
     .wait_until_sent = xencons_wait_until_sent,
 };
+
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+static const char *xennullcon_startup(void)
+{
+    return NULL;
+}
+
+static int xennullcon_dummy(void)
+{
+    return 0;
+}
+
+#define DUMMY	(void *)xennullcon_dummy
+
+/*
+ *  The console `switch' structure for the dummy console
+ *
+ *  Most of the operations are dummies.
+ */
+
+const struct consw xennull_con = {
+    .owner =		THIS_MODULE,
+    .con_startup =	xennullcon_startup,
+    .con_init =		DUMMY,
+    .con_deinit =	DUMMY,
+    .con_clear =	DUMMY,
+    .con_putc =		DUMMY,
+    .con_putcs =	DUMMY,
+    .con_cursor =	DUMMY,
+    .con_scroll =	DUMMY,
+    .con_bmove =	DUMMY,
+    .con_switch =	DUMMY,
+    .con_blank =	DUMMY,
+    .con_font_op =	DUMMY,
+    .con_set_palette =	DUMMY,
+    .con_scrolldelta =	DUMMY,
+};
+#endif
 #endif
 
 static int __init xencons_init(void)