From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LiUuM-0005uz-5e for qemu-devel@nongnu.org; Sat, 14 Mar 2009 10:32:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LiUuH-0005sm-DS for qemu-devel@nongnu.org; Sat, 14 Mar 2009 10:32:13 -0400 Received: from [199.232.76.173] (port=59480 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LiUuH-0005sf-1a for qemu-devel@nongnu.org; Sat, 14 Mar 2009 10:32:09 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:48007) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LiUuG-0007jw-Jd for qemu-devel@nongnu.org; Sat, 14 Mar 2009 10:32:08 -0400 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate02.web.de (Postfix) with ESMTP id 2772DFBB02C4 for ; Sat, 14 Mar 2009 15:32:06 +0100 (CET) Received: from [92.74.55.17] (helo=[192.168.1.2]) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #277) id 1LiUuE-00013G-00 for qemu-devel@nongnu.org; Sat, 14 Mar 2009 15:32:06 +0100 Message-ID: <49BBBFE4.5070301@web.de> Date: Sat, 14 Mar 2009 15:32:04 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: jan.kiszka@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] musicpal: Fix regression caused by 6839 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel [ 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 --- 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));