xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] pv-grub: fix boot crash when no fb is available
@ 2010-04-04 17:18 Samuel Thibault
  2010-04-05 13:40 ` David P. Quigley
  0 siblings, 1 reply; 15+ messages in thread
From: Samuel Thibault @ 2010-04-04 17:18 UTC (permalink / raw)
  To: xen-devel; +Cc: dpquigl, jeremy

pv-grub: fix boot crash when no fb is available

When no fb is available, init_fbfront will return, so the local
semaphore for synchronization with the kbd thread would get dropped.
Using a global static semaphore instead fixes this.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff -r 8dada4c897c9 stubdom/grub/mini-os.c
--- a/stubdom/grub/mini-os.c	Sat Mar 06 13:31:42 2010 +0000
+++ b/stubdom/grub/mini-os.c	Sun Apr 04 19:13:06 2010 +0200
@@ -651,12 +651,11 @@
     return 0;
 }
 
+static DECLARE_MUTEX_LOCKED(kbd_sem);
 static void kbd_thread(void *p)
 {
-    struct semaphore *sem = p;
-
     kbd_dev = init_kbdfront(NULL, 1);
-    up(sem);
+    up(&kbd_sem);
 }
 
 struct fbfront_dev *fb_open(void *fb, int width, int height, int depth)
@@ -665,10 +664,9 @@
     int linesize = width * (depth / 8);
     int memsize = linesize * height;
     int numpages = (memsize + PAGE_SIZE - 1) / PAGE_SIZE;
-    DECLARE_MUTEX_LOCKED(sem);
     int i;
 
-    create_thread("kbdfront", kbd_thread, &sem);
+    create_thread("kbdfront", kbd_thread, &kbd_sem);
 
     mfns = malloc(numpages * sizeof(*mfns));
     for (i = 0; i < numpages; i++) {
@@ -681,7 +679,7 @@
     if (!fb_dev)
         return NULL;
 
-    down(&sem);
+    down(&kbd_sem);
     if (!kbd_dev)
         return NULL;

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

end of thread, other threads:[~2011-04-28 10:56 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-04 17:18 [PATCH] pv-grub: fix boot crash when no fb is available Samuel Thibault
2010-04-05 13:40 ` David P. Quigley
2010-04-05 15:16   ` Samuel Thibault
2010-04-05 15:17     ` David P. Quigley
2010-04-05 21:57       ` Samuel Thibault
2010-04-06 15:42         ` David P. Quigley
2010-04-06 18:16           ` Jeremy Fitzhardinge
2010-04-06 18:22             ` David P. Quigley
2010-04-06 19:17               ` Jeremy Fitzhardinge
2010-04-06 22:28                 ` Daniel Stodden
2010-04-06 21:47           ` Samuel Thibault
2010-04-13 14:55             ` David P. Quigley
2010-04-13 15:12               ` Keir Fraser
2010-04-13 17:16               ` Jeremy Fitzhardinge
2011-04-28 10:56               ` Samuel Thibault

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).