From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Fri, 12 Jan 2007 10:48:46 +0000 (+0000)
Subject: [XEN] Default to 80x50 VGA text console.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15405^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a5e0c983d01566982e34262439db2cb8f524a19c;p=xen.git

[XEN] Default to 80x50 VGA text console.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/drivers/video/vga.c b/xen/drivers/video/vga.c
index 08a260a2b7..303210e466 100644
--- a/xen/drivers/video/vga.c
+++ b/xen/drivers/video/vga.c
@@ -557,7 +557,7 @@ static int vga_load_font(const struct font_desc *font, unsigned rows)
 
 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;