From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnXP-0007tb-GG for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TmnXN-0007SP-A8 for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:27 -0500 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:43430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnXM-0007S7-PO for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:25 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 23 Dec 2012 16:32:45 +0100 Message-Id: <1356276769-7357-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1356276769-7357-1-git-send-email-hpoussin@reactos.org> References: <1356276769-7357-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 5/8] vga/qxl: do not use portio_list_init/portio_list_add List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann Signed-off-by: Herv=C3=A9 Poussineau --- hw/qxl.c | 4 +--- hw/vga.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 96887c4..7982524 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -2048,7 +2048,6 @@ static int qxl_init_primary(PCIDevice *dev) { PCIQXLDevice *qxl =3D DO_UPCAST(PCIQXLDevice, pci, dev); VGACommonState *vga =3D &qxl->vga; - PortioList *qxl_vga_port_list =3D g_new(PortioList, 1); int rc; =20 qxl->id =3D 0; @@ -2056,8 +2055,7 @@ static int qxl_init_primary(PCIDevice *dev) vga->vram_size_mb =3D qxl->vga.vram_size >> 20; vga_common_init(vga); vga_init(vga, pci_address_space(dev), pci_address_space_io(dev), fal= se); - portio_list_init(qxl_vga_port_list, qxl_vga_portio_list, vga, "vga")= ; - portio_list_add(qxl_vga_port_list, pci_address_space_io(dev), 0x3b0)= ; + isa_register_portio_list(NULL, 0x3b0, qxl_vga_portio_list, vga, "vga= "); =20 vga->ds =3D graphic_console_init(qxl_hw_update, qxl_hw_invalidate, qxl_hw_screen_dump, qxl_hw_text_updat= e, qxl); diff --git a/hw/vga.c b/hw/vga.c index c266161..ccdb997 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2349,8 +2349,6 @@ void vga_init(VGACommonState *s, MemoryRegion *addr= ess_space, { MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; - PortioList *vga_port_list =3D g_new(PortioList, 1); - PortioList *vbe_port_list =3D g_new(PortioList, 1); =20 qemu_register_reset(vga_reset, s); =20 @@ -2365,12 +2363,10 @@ void vga_init(VGACommonState *s, MemoryRegion *ad= dress_space, 1); memory_region_set_coalescing(vga_io_memory); if (init_vga_ports) { - portio_list_init(vga_port_list, vga_ports, s, "vga"); - portio_list_add(vga_port_list, address_space_io, 0x3b0); + isa_register_portio_list(NULL, 0x3b0, vga_ports, s, "vga"); } if (vbe_ports) { - portio_list_init(vbe_port_list, vbe_ports, s, "vbe"); - portio_list_add(vbe_port_list, address_space_io, 0x1ce); + isa_register_portio_list(NULL, 0x1ce, vbe_ports, s, "vbe"); } } =20 --=20 1.7.10.4