[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/66] vga: pass owner to vga_init
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 31/66] vga: pass owner to vga_init |
Date: |
Thu, 4 Jul 2013 17:13:27 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/display/qxl.c | 3 ++-
hw/display/vga-pci.c | 3 ++-
hw/display/vga.c | 2 +-
hw/display/vga_int.h | 2 +-
hw/display/vmware_vga.c | 2 +-
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;
}
--
1.8.1.4
- [Qemu-devel] [PATCH 22/66] memory: add ref/unref, (continued)
- [Qemu-devel] [PATCH 22/66] memory: add ref/unref, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 23/66] memory: introduce memory_region_present, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 24/66] memory: add ref/unref calls, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 25/66] exec: check MRU in qemu_ram_addr_from_host, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 26/66] exec: move qemu_ram_addr_from_host_nofail to cputlb.c, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 27/66] memory: return MemoryRegion from qemu_ram_addr_from_host, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 28/66] exec: reorganize address_space_map, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 29/66] memory: ref/unref memory across address_space_map/unmap, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 30/66] escc: rename struct to ESCCState, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 31/66] vga: pass owner to vga_init,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 32/66] vga: pass owner to vga_common_init, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 33/66] vga: pass owner to cirrus_init_common, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 34/66] vga: pass owner to vga_init_vbe, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 35/66] vga: pass owner to vga_init_io, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 36/66] vga: set owner in vga_update_memory_access, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 37/66] ne2000: pass device to ne2000_setup_io, use it as owner, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 38/66] vfio: pass device to vfio_mmap_bar and use it to set owner, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 39/66] spapr_iommu: pass device to spapr_tce_new_table and use it to set owner, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 40/66] pam: pass device to init_pam and use it to set owner, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 41/66] piolist: add owner argument to initialization functions and pass devices, Paolo Bonzini, 2013/07/04