grub-devel.gnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ieee1275: check for IBM pseries emulated machine
@ 2014-03-20 11:27 Nikunj A Dadhania
  2014-03-24 15:44 ` Colin Watson
  0 siblings, 1 reply; 2+ messages in thread
From: Nikunj A Dadhania @ 2014-03-20 11:27 UTC (permalink / raw)
  To: grub-devel


is_qemu is not being set lead to disabling of feature like
GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being
displayed during the grub-menu edit.

Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
---
 grub-core/kern/ieee1275/cmain.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
index d92ae14..3e12e6b 100644
--- a/grub-core/kern/ieee1275/cmain.c
+++ b/grub-core/kern/ieee1275/cmain.c
@@ -84,8 +84,10 @@ grub_ieee1275_find_options (void)
 
   rc = grub_ieee1275_get_property (root, "model",
 				   tmp,	sizeof (tmp), 0);
-  if (rc >= 0 && !grub_strcmp (tmp, "Emulated PC"))
+  if (rc >= 0 && (!grub_strcmp (tmp, "Emulated PC")
+		  || !grub_strcmp (tmp, "IBM pSeries (emulated by qemu)"))) {
     is_qemu = 1;
+  }
 
   if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
     grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ieee1275: check for IBM pseries emulated machine
  2014-03-20 11:27 [PATCH] ieee1275: check for IBM pseries emulated machine Nikunj A Dadhania
@ 2014-03-24 15:44 ` Colin Watson
  0 siblings, 0 replies; 2+ messages in thread
From: Colin Watson @ 2014-03-24 15:44 UTC (permalink / raw)
  To: The development of GNU GRUB

On Thu, Mar 20, 2014 at 04:57:12PM +0530, Nikunj A Dadhania wrote:
> is_qemu is not being set lead to disabling of feature like
> GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being
> displayed during the grub-menu edit.

Looks reasonable, thanks.  Pushed.

-- 
Colin Watson                                       [cjwatson@ubuntu.com]


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-03-24 15:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-20 11:27 [PATCH] ieee1275: check for IBM pseries emulated machine Nikunj A Dadhania
2014-03-24 15:44 ` Colin Watson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).