From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LncMa-0003Rk-Nh
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:30:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LncMW-0003QP-4j
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:30:32 -0400
Received: from [199.232.76.173] (port=48610 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LncMV-0003QJ-UC
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:30:28 -0400
Received: from e2.ny.us.ibm.com ([32.97.182.142]:43855)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <aliguori@us.ibm.com>) id 1LncMV-0006Ia-Lz
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:30:27 -0400
Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234])
	by e2.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n2SHRSLS005269
	for <qemu-devel@nongnu.org>; Sat, 28 Mar 2009 13:27:28 -0400
Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215])
	by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id
	n2SHUQrC046348
	for <qemu-devel@nongnu.org>; Sat, 28 Mar 2009 13:30:26 -0400
Received: from d01av01.pok.ibm.com (loopback [127.0.0.1])
	by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id
	n2SHUQ86024680
	for <qemu-devel@nongnu.org>; Sat, 28 Mar 2009 13:30:26 -0400
Received: from squirrel.codemonkey.ws (sig-9-65-67-103.mts.ibm.com
	[9.65.67.103])
	by d01av01.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id
	n2SHUQlQ024672
	for <qemu-devel@nongnu.org>; Sat, 28 Mar 2009 13:30:26 -0400
Message-ID: <49CE5EB1.7090602@us.ibm.com>
Date: Sat, 28 Mar 2009 12:30:25 -0500
From: Anthony Liguori <aliguori@us.ibm.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] musicpal: Fix regression caused by 6839
References: <49BBBFE4.5070301@web.de>
In-Reply-To: <49BBBFE4.5070301@web.de>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
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

Jan Kiszka wrote:
> [ 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 <jan.kiszka@web.de>
>   

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>
>  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));
>
>
>
>