From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Apr 2013 22:45:29 +0000 (+0200)
Subject: 	* grub-core/term/ieee1275/console.c (grub_console_dimensions): Ignore
X-Git-Tag: grub-2.02-beta1~1117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65a6b30b474f7b8704d47157e2aa5e1615cced97;p=thirdparty%2Fgrub.git

	* grub-core/term/ieee1275/console.c (grub_console_dimensions): Ignore
	bogus SLOF values.
---

diff --git a/ChangeLog b/ChangeLog
index 9f2eccc0f..2670946df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/ieee1275/console.c (grub_console_dimensions): Ignore
+	bogus SLOF values.
+
 2013-04-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Make check work on mips-arc.
diff --git a/grub-core/term/ieee1275/console.c b/grub-core/term/ieee1275/console.c
index 3a808640e..6bcee5863 100644
--- a/grub-core/term/ieee1275/console.c
+++ b/grub-core/term/ieee1275/console.c
@@ -123,6 +123,14 @@ grub_console_dimensions (void)
 	}
     }
 
+  /* Bogus default value on SLOF in QEMU.  */
+  if (grub_console_terminfo_output.width == 200
+      && grub_console_terminfo_output.height == 200)
+    {
+      grub_console_terminfo_output.width = 80;
+      grub_console_terminfo_output.height = 24;
+    }
+
   /* Use a small console by default.  */
   if (! grub_console_terminfo_output.width)
     grub_console_terminfo_output.width = 80;