From patchwork Fri Jan 4 21:29:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [07/10] vga/qxl: do not use portio_list_init/portio_list_add From: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 209569 Message-Id: <1357334986-13941-8-git-send-email-hpoussin@reactos.org> To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Fri, 4 Jan 2013 22:29:42 +0100 Signed-off-by: Hervé 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 d08b9bd..8279a95 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -2048,7 +2048,6 @@ static int qxl_init_primary(PCIDevice *dev) { PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev); VGACommonState *vga = &qxl->vga; - PortioList *qxl_vga_port_list = g_new(PortioList, 1); int rc; qxl->id = 0; @@ -2056,8 +2055,7 @@ static int qxl_init_primary(PCIDevice *dev) vga->vram_size_mb = qxl->vga.vram_size >> 20; vga_common_init(vga); vga_init(vga, pci_address_space(dev), pci_address_space_io(dev), false); - 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"); vga->ds = graphic_console_init(qxl_hw_update, qxl_hw_invalidate, qxl_hw_screen_dump, qxl_hw_text_update, qxl); diff --git a/hw/vga.c b/hw/vga.c index e2ba7f2..ffa9db5 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2349,8 +2349,6 @@ void vga_init(VGACommonState *s, MemoryRegion *address_space, { MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; - PortioList *vga_port_list = g_new(PortioList, 1); - PortioList *vbe_port_list = g_new(PortioList, 1); qemu_register_reset(vga_reset, s); @@ -2365,12 +2363,10 @@ void vga_init(VGACommonState *s, MemoryRegion *address_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"); } }