From patchwork Thu Sep 15 09:26:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 114770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 40C33B70BC for ; Thu, 15 Sep 2011 19:27:14 +1000 (EST) Received: from localhost ([::1]:50562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R48Dr-0006RX-Nz for incoming@patchwork.ozlabs.org; Thu, 15 Sep 2011 05:27:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R48Dm-0006RS-1n for qemu-devel@nongnu.org; Thu, 15 Sep 2011 05:27:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R48Dk-0004sj-Fj for qemu-devel@nongnu.org; Thu, 15 Sep 2011 05:27:02 -0400 Received: from goliath.siemens.de ([192.35.17.28]:21521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R48Dj-0004rf-S2 for qemu-devel@nongnu.org; Thu, 15 Sep 2011 05:27:00 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p8F9QuGI014045; Thu, 15 Sep 2011 11:26:56 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p8F9Qu6A022992; Thu, 15 Sep 2011 11:26:56 +0200 Message-ID: <4E71C4E0.9000007@siemens.com> Date: Thu, 15 Sep 2011 11:26:56 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Anthony Liguori X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: qemu-devel Subject: [Qemu-devel] [PATCH] vga: Respect isa_mem_base when registering chain4 alias X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This does not yet unbreak PPC (which has its own problems) but potentially other non-x86 systems where isa_mem_base is != 0. Signed-off-by: Jan Kiszka --- hw/vga.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 125fb29..0a0c5a6 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -181,6 +181,7 @@ static void vga_update_memory_access(VGACommonState *s) size = 0x8000; break; } + base += isa_mem_base; region = g_malloc(sizeof(*region)); memory_region_init_alias(region, "vga.chain4", &s->vram, offset, size); memory_region_add_subregion_overlap(s->legacy_address_space, base,