From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulFq-0001bL-4P for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:15:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UulFo-0005R4-R1 for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:15:30 -0400 Received: from mail-wg0-x22d.google.com ([2a00:1450:400c:c00::22d]:45916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulFo-0005Qy-In for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:15:28 -0400 Received: by mail-wg0-f45.google.com with SMTP id j13so1234992wgh.0 for ; Thu, 04 Jul 2013 08:15:28 -0700 (PDT) Received: from playground.station (net-37-117-148-210.cust.dsl.vodafone.it. [37.117.148.210]) by mx.google.com with ESMTPSA id d8sm4212546wiz.0.2013.07.04.08.15.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Jul 2013 08:15:27 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 4 Jul 2013 17:13:27 +0200 Message-Id: <1372950842-32422-32-git-send-email-pbonzini@redhat.com> In-Reply-To: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> References: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 31/66] vga: pass owner to vga_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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