Fix ui/core display depth mismatch.

This patch fixes a problem where the core's framebuffer was
incorrectly initialized to a pitch of width*4 by default
(instead of width*2 when using a 16-bit framebuffer).

The reason for this was complex, but essentially, when the
machine initialization was moved before the display one in
vl-android.c, this changed the way the DisplayState was
initialized.

Also get rid of the useless and confusing "display_state"
global in vl-android.c (not the same than "display_state" in
console.c)

Change-Id: If8e2b8baf7ccaeedcb66da0174cc529521d67a60

1 files changed, 2 insertions, 2 deletions

diff --git a/console.h b/console.h
index b8e1234..bfbc71c 100644
--- a/console.h
+++ b/console.h
@@ -200,7 +200,7 @@ DisplayAllocator *register_displayallocator(DisplayState *ds, DisplayAllocator *
 
 static inline DisplaySurface* qemu_create_displaysurface(DisplayState *ds, int width, int height)
 {
-    return ds->allocator->create_displaysurface(width, height);    
+    return ds->allocator->create_displaysurface(width, height);
 }
 
 static inline DisplaySurface* qemu_resize_displaysurface(DisplayState *ds, int width, int height)
@@ -381,7 +381,7 @@ char *vnc_display_local_addr(DisplayState *ds);
 void curses_display_init(DisplayState *ds, int full_screen);
 
 #ifdef CONFIG_ANDROID
-void android_display_init_from(int width, int height, int rotation, int bpp);
+void android_display_reset(DisplayState* ds, int width, int height, int bitspp);
 #endif
 
 #endif