From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NaxiV-0004iN-UE
	for qemu-devel@nongnu.org; Fri, 29 Jan 2010 15:45:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NaxiR-0004g8-Bz
	for qemu-devel@nongnu.org; Fri, 29 Jan 2010 15:45:23 -0500
Received: from [199.232.76.173] (port=33947 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NaxiQ-0004fz-WA
	for qemu-devel@nongnu.org; Fri, 29 Jan 2010 15:45:19 -0500
Received: from mail-iw0-f172.google.com ([209.85.223.172]:51279)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NaxiQ-0001By-Eh
	for qemu-devel@nongnu.org; Fri, 29 Jan 2010 15:45:18 -0500
Received: by mail-iw0-f172.google.com with SMTP id 2so1744601iwn.19
	for <qemu-devel@nongnu.org>; Fri, 29 Jan 2010 12:45:18 -0800 (PST)
Message-ID: <4B6348DB.4010500@codemonkey.ws>
Date: Fri, 29 Jan 2010 14:45:15 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH][STABLE] cirrus: Properly re-register
	cirrus_linear_io_addr on vram unmap
References: <4B62ECE0.9060306@siemens.com>
In-Reply-To: <4B62ECE0.9060306@siemens.com>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
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: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Alexander Graf <agraf@suse.de>, Anthony Liguori <aliguori@us.ibm.com>, rene@exactcode.de, Glauber Costa <glommer@redhat.com>, qemu-devel <qemu-devel@nongnu.org>

On 01/29/2010 08:12 AM, Jan Kiszka wrote:
> This fixes CONFIG_FB_CIRRUS for Linux guests and probably much more:
>
> When switching away from linearly mapped vram, we also have to restore
> the I/O handlers for the LFB.
>
> This regression was once introduced by commit 2bec46dc97.
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
> ---
>   hw/cirrus_vga.c |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
> index 6fe433d..9f61a01 100644
> --- a/hw/cirrus_vga.c
> +++ b/hw/cirrus_vga.c
> @@ -2585,9 +2585,11 @@ static void map_linear_vram(CirrusVGAState *s)
>
>   static void unmap_linear_vram(CirrusVGAState *s)
>   {
> -    if (s->vga.map_addr&&  s->vga.lfb_addr&&  s->vga.lfb_end)
> +    if (s->vga.map_addr&&  s->vga.lfb_addr&&  s->vga.lfb_end) {
>           s->vga.map_addr = s->vga.map_end = 0;
> -
> +         cpu_register_physical_memory(s->vga.lfb_addr, s->vga.vram_size,
> +                                      s->cirrus_linear_io_addr);
> +    }
>       cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000,
>                                    s->vga.vga_io_memory);
>   }
>
>
>
>