aboutsummaryrefslogtreecommitdiff
path: root/hw/display
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-06-06 21:21:13 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2013-07-04 17:42:46 +0200
commit712f0cc777dc8abc1f43b8e2a5e65ab3ae563cbd (patch)
treefd3857d597c34cb68fcff14b4d9ed636e5ed3954 /hw/display
parent3cf63ff25c6f1bdac7cb153f87ff830e932ac2f5 (diff)
downloadqemu-712f0cc777dc8abc1f43b8e2a5e65ab3ae563cbd.zip
qemu-712f0cc777dc8abc1f43b8e2a5e65ab3ae563cbd.tar.gz
qemu-712f0cc777dc8abc1f43b8e2a5e65ab3ae563cbd.tar.bz2
vga: pass owner to vga_init
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/display')
-rw-r--r--hw/display/qxl.c3
-rw-r--r--hw/display/vga-pci.c3
-rw-r--r--hw/display/vga.c2
-rw-r--r--hw/display/vga_int.h2
-rw-r--r--hw/display/vmware_vga.c2
5 files changed, 7 insertions, 5 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index bcfcce4..5754fdc 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -2068,7 +2068,8 @@ static int qxl_init_primary(PCIDevice *dev)
qxl_init_ramsize(qxl);
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);
+ 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_add(qxl_vga_port_list, pci_address_space_io(dev), 0x3b0);
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 23d5b56..4716230 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -148,7 +148,8 @@ static int pci_std_vga_initfn(PCIDevice *dev)
/* vga + console init */
vga_common_init(s);
- vga_init(s, pci_address_space(dev), pci_address_space_io(dev), true);
+ vga_init(s, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev),
+ true);
s->con = graphic_console_init(DEVICE(dev), s->hw_ops, s);
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 21e3763..24b8b45 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2350,7 +2350,7 @@ MemoryRegion *vga_init_io(VGACommonState *s,
return vga_mem;
}
-void vga_init(VGACommonState *s, MemoryRegion *address_space,
+void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
MemoryRegion *address_space_io, bool init_vga_ports)
{
MemoryRegion *vga_io_memory;
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 66f9f3c..accc9f5 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -178,7 +178,7 @@ static inline int c6_to_8(int v)
}
void vga_common_init(VGACommonState *s);
-void vga_init(VGACommonState *s, MemoryRegion *address_space,
+void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
MemoryRegion *address_space_io, bool init_vga_ports);
MemoryRegion *vga_init_io(VGACommonState *s,
const MemoryRegionPortio **vga_ports,
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 05be1fa..358bcc0 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -1199,7 +1199,7 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s,
s->fifo_ptr = memory_region_get_ram_ptr(&s->fifo_ram);
vga_common_init(&s->vga);
- vga_init(&s->vga, address_space, io, true);
+ vga_init(&s->vga, OBJECT(dev), address_space, io, true);
vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga);
s->new_depth = 32;
}