[Xen-changelog] [xen-unstable] [XEN] Default to 80x50 VGA text console.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1168598926 0
# Node ID 204c2724f80082713554c2ba71e0728f63d28e79
# Parent  f328425d553e22a04be4ed73dbdfa01172799746
[XEN] Default to 80x50 VGA text console.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/drivers/video/vga.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff -r f328425d553e -r 204c2724f800 xen/drivers/video/vga.c
--- a/xen/drivers/video/vga.c   Fri Jan 12 10:31:16 2007 +0000
+++ b/xen/drivers/video/vga.c   Fri Jan 12 10:48:46 2007 +0000
@@ -557,7 +557,7 @@ static int vga_load_font(const struct fo
 
 static int vgacon_enabled = 0;
 static int vgacon_keep    = 0;
-static int vgacon_lines   = 25;
+static int vgacon_lines   = 50;
 static const struct font_desc *font;
 
 static int xpos, ypos;
@@ -606,12 +606,9 @@ void vga_init(void)
     case 60:
         font = &font_vga_8x8;
         break;
-    default:
-        vgacon_lines = 25;
-        break;
-    }
-
-    if ( (font != NULL) && (vga_load_font(font, vgacon_lines) < 0) )
+    }
+
+    if ( (font == NULL) || (vga_load_font(font, vgacon_lines) < 0) )
     {
         vgacon_lines = 25;
         font = NULL;

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