From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LncL6-0002vl-4t
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:29:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LncL2-0002sg-8D
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:28:56 -0400
Received: from [199.232.76.173] (port=56980 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LncL1-0002sR-2V
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:28:55 -0400
Received: from savannah.gnu.org ([199.232.41.3]:54365 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LncL0-000686-Pa
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:28:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LncL0-0005ft-82
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 17:28:54 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LncL0-0005fp-1N
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 17:28:54 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LncL0-0005fp-1N@cvs.savannah.gnu.org>
Date: Sat, 28 Mar 2009 17:28:54 +0000
Subject: [Qemu-devel] [6898] musicpal: Fix regression caused by 6839 (Jan
	Kiszka)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6898
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6898
Author:   aliguori
Date:     2009-03-28 17:28:53 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
musicpal: Fix regression caused by 6839 (Jan Kiszka)

Pass correct DisplayState field to is_surface_bgr().

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/musicpal.c

Modified: trunk/hw/musicpal.c
===================================================================
--- trunk/hw/musicpal.c	2009-03-28 17:28:49 UTC (rev 6897)
+++ trunk/hw/musicpal.c	2009-03-28 17:28:53 UTC (rev 6898)
@@ -831,7 +831,8 @@
         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));