[Qemu-devel] [PATCH] musicpal: Fix regression caused by 6839

[Jan Kiszka]

[ Mmh, I was hoping that bringing down "normal" warnings to a minimum
would help people noticing patch regressions more easily... ]

Pass correct DisplayState field to is_surface_bgr().

Signed-off-by: Jan Kiszka <address@hidden>
---

 hw/musicpal.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/musicpal.c b/hw/musicpal.c
index abd3afa..8eb1316 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -831,7 +831,8 @@ static void lcd_refresh(void *opaque)
         break;
     LCD_REFRESH(8, rgb_to_pixel8)
     LCD_REFRESH(16, rgb_to_pixel16)
-    LCD_REFRESH(32, (is_surface_bgr(s->ds) ? rgb_to_pixel32bgr : 
rgb_to_pixel32))
+    LCD_REFRESH(32, (is_surface_bgr(s->ds->surface) ?
+                     rgb_to_pixel32bgr : rgb_to_pixel32))
     default:
         cpu_abort(cpu_single_env, "unsupported colour depth %i\n",
                   ds_get_bits_per_pixel(s->ds));