summary refs log tree commit diff stats
path: root/hw/blizzard.c
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-09 17:00:41 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-09 17:00:41 +0000
commit0921895137fc8c43f08cf1b2ddb6d6ae14438f12 (patch)
treecbfc8e186f789720754f34e15899ed07caab3028 /hw/blizzard.c
parentbd5ea513986dfe68d1828ddd9df20078e743638f (diff)
downloadfocaccia-qemu-0921895137fc8c43f08cf1b2ddb6d6ae14438f12.tar.gz
focaccia-qemu-0921895137fc8c43f08cf1b2ddb6d6ae14438f12.zip
Fix displaystate (r6344) regression in blizzard
Testcase:

qemu-system-arm -M n810 -kernel /dev/null -m 130

Without this patch, we get a segfault.

Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6577 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/blizzard.c')
-rw-r--r--hw/blizzard.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/blizzard.c b/hw/blizzard.c
index 83f13bca55..0f6801631a 100644
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -959,6 +959,10 @@ void *s1d13745_init(qemu_irq gpio_int)
 
     s->fb = qemu_malloc(0x180000);
 
+    s->state = graphic_console_init(blizzard_update_display,
+                                 blizzard_invalidate_display,
+                                 blizzard_screen_dump, NULL, s);
+
     switch (ds_get_bits_per_pixel(s->state)) {
     case 0:
         s->line_fn_tab[0] = s->line_fn_tab[1] =
@@ -991,9 +995,5 @@ void *s1d13745_init(qemu_irq gpio_int)
 
     blizzard_reset(s);
 
-    s->state = graphic_console_init(blizzard_update_display,
-                                 blizzard_invalidate_display,
-                                 blizzard_screen_dump, NULL, s);
-
     return s;
 }