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

	bogus SLOF values.

diff --git a/ChangeLog b/ChangeLog
index 9f2eccc0fa982e5965b97aa3da625f8dec5825dc..2670946df354d55b523af06217e88650b5303f2c 100644 (file)
--- 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 3a808640e5771df7a199478b2c793768d3294b61..6bcee586356e3fb74beec51f83b2b738de2d55e0 100644 (file)
--- 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;