From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qumyc-0006oQ-I1 for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qumyb-0007fd-9X for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:46 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:49406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qumya-0007ZC-Fn for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:45 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 20 Aug 2011 16:56:33 +0200 Message-Id: <1313852195-23081-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1313852195-23081-1-git-send-email-hpoussin@reactos.org> References: <1313852195-23081-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC 4/6] vga: use isa_address_space() method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/cirrus_vga.c | 4 ++-- hw/vga-isa.c | 4 ++-- hw/vga.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index b489309..ebc4aec 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2856,8 +2856,8 @@ static void cirrus_init_common(CirrusVGAState * s, = int device_id, int is_pci) memory_region_init_io(&s->low_mem, &cirrus_vga_mem_ops, s, "cirrus-low-memory", 0x20000); memory_region_add_subregion(&s->low_mem_container, 0, &s->low_mem); - memory_region_add_subregion_overlap(get_system_memory(), - isa_mem_base + 0x000a0000, + memory_region_add_subregion_overlap(isa_address_space(), + 0x000a0000, &s->low_mem_container, 1); memory_region_set_coalescing(&s->low_mem); diff --git a/hw/vga-isa.c b/hw/vga-isa.c index fef7f58..bbbf643 100644 --- a/hw/vga-isa.c +++ b/hw/vga-isa.c @@ -51,8 +51,8 @@ static int vga_initfn(ISADevice *dev) =20 vga_common_init(s, VGA_RAM_SIZE); vga_io_memory =3D vga_init_io(s); - memory_region_add_subregion_overlap(get_system_memory(), - isa_mem_base + 0x000a0000, + memory_region_add_subregion_overlap(isa_address_space(), + 0x000a0000, vga_io_memory, 1); memory_region_set_coalescing(vga_io_memory); isa_init_ioport(dev, 0x3c0); diff --git a/hw/vga.c b/hw/vga.c index 33dc478..0d4b5c2 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2250,8 +2250,8 @@ void vga_init(VGACommonState *s) s->bank_offset =3D 0; =20 vga_io_memory =3D vga_init_io(s); - memory_region_add_subregion_overlap(get_system_memory(), - isa_mem_base + 0x000a0000, + memory_region_add_subregion_overlap(isa_address_space(), + 0x000a0000, vga_io_memory, 1); memory_region_set_coalescing(vga_io_memory); --=20 1.7.5.4