From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pog-0002n1-0u for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Poc-0003t1-M2 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45788 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Poc-0003sg-AF for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:54 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:45:59 +0200 Message-Id: <1374536796-13983-19-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 18/55] acpi/piix4: 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?= , "Michael S. Tsirkin" Replace direct uses of PIIX4PMState::dev with QOM casts and rename it to parent_obj. Acked-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/acpi/piix4.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 5cd286e..c885690 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -64,7 +64,9 @@ typedef struct CPUStatus { } CPUStatus; =20 typedef struct PIIX4PMState { - PCIDevice dev; + /*< private >*/ + PCIDevice parent_obj; + /*< public >*/ =20 MemoryRegion io; MemoryRegion io_gpe; @@ -135,11 +137,12 @@ static void pm_tmr_timer(ACPIREGS *ar) static void apm_ctrl_changed(uint32_t val, void *arg) { PIIX4PMState *s =3D arg; + PCIDevice *d =3D PCI_DEVICE(s); =20 /* ACPI specs 3.0, 4.7.2.5 */ acpi_pm1_cnt_update(&s->ar, val =3D=3D ACPI_ENABLE, val =3D=3D ACPI_= DISABLE); =20 - if (s->dev.config[0x5b] & (1 << 1)) { + if (d->config[0x5b] & (1 << 1)) { if (s->smi_irq) { qemu_irq_raise(s->smi_irq); } @@ -148,24 +151,27 @@ static void apm_ctrl_changed(uint32_t val, void *ar= g) =20 static void pm_io_space_update(PIIX4PMState *s) { + PCIDevice *d =3D PCI_DEVICE(s); uint32_t pm_io_base; =20 - pm_io_base =3D le32_to_cpu(*(uint32_t *)(s->dev.config + 0x40)); + pm_io_base =3D le32_to_cpu(*(uint32_t *)(d->config + 0x40)); pm_io_base &=3D 0xffc0; =20 memory_region_transaction_begin(); - memory_region_set_enabled(&s->io, s->dev.config[0x80] & 1); + memory_region_set_enabled(&s->io, d->config[0x80] & 1); memory_region_set_address(&s->io, pm_io_base); memory_region_transaction_commit(); } =20 static void smbus_io_space_update(PIIX4PMState *s) { - s->smb_io_base =3D le32_to_cpu(*(uint32_t *)(s->dev.config + 0x90)); + PCIDevice *d =3D PCI_DEVICE(s); + + s->smb_io_base =3D le32_to_cpu(*(uint32_t *)(d->config + 0x90)); s->smb_io_base &=3D 0xffc0; =20 memory_region_transaction_begin(); - memory_region_set_enabled(&s->smb.io, s->dev.config[0xd2] & 1); + memory_region_set_enabled(&s->smb.io, d->config[0xd2] & 1); memory_region_set_address(&s->smb.io, s->smb_io_base); memory_region_transaction_commit(); } @@ -244,7 +250,7 @@ static int acpi_load_old(QEMUFile *f, void *opaque, i= nt version_id) int ret, i; uint16_t temp; =20 - ret =3D pci_device_load(&s->dev, f); + ret =3D pci_device_load(PCI_DEVICE(s), f); if (ret < 0) { return ret; } @@ -288,7 +294,7 @@ static const VMStateDescription vmstate_acpi =3D { .load_state_old =3D acpi_load_old, .post_load =3D vmstate_acpi_post_load, .fields =3D (VMStateField []) { - VMSTATE_PCI_DEVICE(dev, PIIX4PMState), + VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), VMSTATE_UINT16(ar.pm1.evt.sts, PIIX4PMState), VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), VMSTATE_UINT16(ar.pm1.cnt.cnt, PIIX4PMState), @@ -359,7 +365,8 @@ static void piix4_update_hotplug(PIIX4PMState *s) static void piix4_reset(void *opaque) { PIIX4PMState *s =3D opaque; - uint8_t *pci_conf =3D s->dev.config; + PCIDevice *d =3D PCI_DEVICE(s); + uint8_t *pci_conf =3D d->config; =20 pci_conf[0x58] =3D 0; pci_conf[0x59] =3D 0; @@ -387,10 +394,11 @@ static void piix4_pm_powerdown_req(Notifier *n, voi= d *opaque) static void piix4_pm_machine_ready(Notifier *n, void *opaque) { PIIX4PMState *s =3D container_of(n, PIIX4PMState, machine_ready); - MemoryRegion *io_as =3D pci_address_space_io(&s->dev); + PCIDevice *d =3D PCI_DEVICE(s); + MemoryRegion *io_as =3D pci_address_space_io(d); uint8_t *pci_conf; =20 - pci_conf =3D s->dev.config; + pci_conf =3D d->config; pci_conf[0x5f] =3D 0x10 | (memory_region_present(io_as, 0x378) ? 0x80 : 0); pci_conf[0x63] =3D 0x60; @@ -403,7 +411,7 @@ static int piix4_pm_initfn(PCIDevice *dev) PIIX4PMState *s =3D PIIX4_PM(dev); uint8_t *pci_conf; =20 - pci_conf =3D s->dev.config; + pci_conf =3D dev->config; pci_conf[0x06] =3D 0x80; pci_conf[0x07] =3D 0x02; pci_conf[0x09] =3D 0x00; --=20 1.8.1.4