From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pok-0002xv-TW for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Pog-0003vC-Kk for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:02 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45803 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pog-0003uw-8z for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:58 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id AE449A41E0 for ; Tue, 23 Jul 2013 01:46:57 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:46:07 +0200 Message-Id: <1374536796-13983-27-git-send-email-afaerber@suse.de> In-Reply-To: <1374536796-13983-1-git-send-email-afaerber@suse.de> References: <1374536796-13983-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 26/55] xen/xen_platform: QOM parent field cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Replace direct uses of PCIXenPlatformState::pci_dev field with QOM casts and rename it to parent_obj. Acked-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/xen/xen_platform.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c index 52a7279..6a8ba7e 100644 --- a/hw/xen/xen_platform.c +++ b/hw/xen/xen_platform.c @@ -49,7 +49,10 @@ #define PFFLAG_ROM_LOCK 1 /* Sets whether ROM memory area is RW or RO */ =20 typedef struct PCIXenPlatformState { - PCIDevice pci_dev; + /*< private >*/ + PCIDevice parent_obj; + /*< public >*/ + MemoryRegion fixed_io; MemoryRegion bar; MemoryRegion mmio_bar; @@ -121,7 +124,8 @@ static void platform_fixed_ioport_writew(void *opaque= , uint32_t addr, uint32_t v PCIXenPlatformState *s =3D opaque; =20 switch (addr) { - case 0: + case 0: { + PCIDevice *pci_dev =3D PCI_DEVICE(s); /* Unplug devices. Value is a bitmask of which devices to unplug, with bit 0 the IDE devices, bit 1 the network devices, and bit 2 the non-primary-master IDE devices. */ @@ -129,16 +133,17 @@ static void platform_fixed_ioport_writew(void *opaq= ue, uint32_t addr, uint32_t v DPRINTF("unplug disks\n"); bdrv_drain_all(); bdrv_flush_all(); - pci_unplug_disks(s->pci_dev.bus); + pci_unplug_disks(pci_dev->bus); } if (val & UNPLUG_ALL_NICS) { DPRINTF("unplug nics\n"); - pci_unplug_nics(s->pci_dev.bus); + pci_unplug_nics(pci_dev->bus); } if (val & UNPLUG_AUX_IDE_DISKS) { DPRINTF("unplug auxiliary disks not supported\n"); } break; + } case 2: switch (val) { case 1: @@ -372,7 +377,7 @@ static const VMStateDescription vmstate_xen_platform = =3D { .minimum_version_id_old =3D 4, .post_load =3D xen_platform_post_load, .fields =3D (VMStateField []) { - VMSTATE_PCI_DEVICE(pci_dev, PCIXenPlatformState), + VMSTATE_PCI_DEVICE(parent_obj, PCIXenPlatformState), VMSTATE_UINT8(flags, PCIXenPlatformState), VMSTATE_END_OF_LIST() } @@ -383,7 +388,7 @@ static int xen_platform_initfn(PCIDevice *dev) PCIXenPlatformState *d =3D XEN_PLATFORM(dev); uint8_t *pci_conf; =20 - pci_conf =3D d->pci_dev.config; + pci_conf =3D dev->config; =20 pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_ME= MORY); =20 @@ -392,11 +397,11 @@ static int xen_platform_initfn(PCIDevice *dev) pci_conf[PCI_INTERRUPT_PIN] =3D 1; =20 platform_ioport_bar_setup(d); - pci_register_bar(&d->pci_dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->bar)= ; + pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->bar); =20 /* reserve 16MB mmio address for share memory*/ platform_mmio_setup(d); - pci_register_bar(&d->pci_dev, 1, PCI_BASE_ADDRESS_MEM_PREFETCH, + pci_register_bar(dev, 1, PCI_BASE_ADDRESS_MEM_PREFETCH, &d->mmio_bar); =20 platform_fixed_ioport_init(d); --=20 1.8.1.4