diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-06 21:19:53 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-07-04 17:42:47 +0200 |
| commit | db10ca9057b11222408f708d5d99a3888eca4feb (patch) | |
| tree | 7900437ac9fa0a1fd3d85073bccc988c588cd7c8 /hw/display | |
| parent | 3cd2cf4375993494bcf6195c1637a3d009aa6fae (diff) | |
| download | qemu-db10ca9057b11222408f708d5d99a3888eca4feb.tar.gz qemu-db10ca9057b11222408f708d5d99a3888eca4feb.tar.bz2 qemu-db10ca9057b11222408f708d5d99a3888eca4feb.zip | |
piolist: add owner argument to initialization functions and pass devices
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/qxl.c | 3 | ||||
| -rw-r--r-- | hw/display/vga.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 59925ec4e5..3804fe292b 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2070,7 +2070,8 @@ static int qxl_init_primary(PCIDevice *dev) vga_common_init(vga, OBJECT(dev)); vga_init(vga, OBJECT(dev), 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_init(qxl_vga_port_list, OBJECT(dev), qxl_vga_portio_list, + vga, "vga"); portio_list_add(qxl_vga_port_list, pci_address_space_io(dev), 0x3b0); vga->con = graphic_console_init(DEVICE(dev), &qxl_ops, qxl); diff --git a/hw/display/vga.c b/hw/display/vga.c index 1657356415..06f44a808c 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2372,11 +2372,11 @@ void vga_init(VGACommonState *s, Object *obj, 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_init(vga_port_list, obj, vga_ports, s, "vga"); portio_list_add(vga_port_list, address_space_io, 0x3b0); } if (vbe_ports) { - portio_list_init(vbe_port_list, vbe_ports, s, "vbe"); + portio_list_init(vbe_port_list, obj, vbe_ports, s, "vbe"); portio_list_add(vbe_port_list, address_space_io, 0x1ce); } } |