diff options
| author | Richard Henderson <rth@twiddle.net> | 2011-08-16 08:27:39 -0700 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-11 15:57:10 +0200 |
| commit | 0a039dc70096b768d3810afa50ba1d214768aaf4 (patch) | |
| tree | 6f47043cf7b2913ffb82d0eed6d4bb7da643ef47 /hw/vmware_vga.c | |
| parent | 42c1a22de73bcf82c3d4fb4fa18e1a70fd67561e (diff) | |
| download | hqemu-0a039dc70096b768d3810afa50ba1d214768aaf4.zip hqemu-0a039dc70096b768d3810afa50ba1d214768aaf4.tar.gz | |
vga: Convert to isa_register_portio_list
[jan: fix cut'n'paste errors]
[avi: adjust pci variants not to use isa functions]
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/vmware_vga.c')
| -rw-r--r-- | hw/vmware_vga.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index aa68237..af70bde 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1079,7 +1079,7 @@ static const VMStateDescription vmstate_vmware_vga = { }; static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size, - MemoryRegion *address_space) + MemoryRegion *address_space, MemoryRegion *io) { s->scratch_size = SVGA_SCRATCH_SIZE; s->scratch = g_malloc(s->scratch_size * 4); @@ -1095,7 +1095,7 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size, s->fifo_ptr = memory_region_get_ram_ptr(&s->fifo_ram); vga_common_init(&s->vga, vga_ram_size); - vga_init(&s->vga, address_space); + vga_init(&s->vga, address_space, io, true); vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); s->depth = ds_get_bits_per_pixel(s->vga.ds); @@ -1183,7 +1183,8 @@ static int pci_vmsvga_initfn(PCIDevice *dev) "vmsvga-io", 0x10); pci_register_bar(&s->card, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar); - vmsvga_init(&s->chip, VGA_RAM_SIZE, pci_address_space(dev)); + vmsvga_init(&s->chip, VGA_RAM_SIZE, pci_address_space(dev), + pci_address_space_io(dev)); pci_register_bar(&s->card, 1, PCI_BASE_ADDRESS_MEM_PREFETCH, iomem); pci_register_bar(&s->card, 2, PCI_BASE_ADDRESS_MEM_PREFETCH, |
