[Xen-changelog] [linux-2.6.18-xen] [IA64] Default to xvc console

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1186952644 21600
# Node ID 41b7a0d7c2adcf6b77602ecf37883c98c5d20acc
# Parent  8dd0c593a5a214ac1494ad53afee73aa2fed817a
[IA64] Default to xvc console

Based on patch from Aron Griffis

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 arch/ia64/kernel/setup.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff -r 8dd0c593a5a2 -r 41b7a0d7c2ad arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c  Sun Aug 12 14:50:32 2007 -0600
+++ b/arch/ia64/kernel/setup.c  Sun Aug 12 15:04:04 2007 -0600
@@ -538,20 +538,21 @@ setup_arch (char **cmdline_p)
 
                /*
                 * If a console= is NOT specified, we assume using the
-                * xencons console is desired.  By default, this is ttyS0
-                * for dom0 and tty0 for domU.
+                * xencons console is desired.  By default, this is xvc0
+                * for both dom0 and domU.
                 */
                if (!strstr(*cmdline_p, "console=")) {
-                       char *p, *q, name[5];
+                       char *p, *q, name[5] = "xvc";
                        int offset = 0;
 
-                       memset(name, 0, sizeof(name));
 #if defined(CONFIG_VGA_CONSOLE)
-                       if (!is_initial_xendomain() || conswitchp == &vga_con)
+                       /*
+                        * conswitchp might be set intelligently from the
+                        * PCDP code.  If set to VGA console, use it.
+                        */
+                       if (is_initial_xendomain() && conswitchp == &vga_con)
                                strncpy(name, "tty", 3);
-                       else
-#endif
-                               strncpy(name, "ttyS", 4);
+#endif
 
                        p = strstr(*cmdline_p, "xencons=");
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog