From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t00-0001rm-VN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3szv-0002AK-PQ for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53215 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3szv-00029x-98 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:47 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:17:47 +0200 Message-Id: <1375125630-24869-11-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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 010/173] pci-bridge-dev: QOM parent field cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Rename it to avoid accidental use. Signed-off-by: Peter Crosthwaite Reviewed-by: Don Koch Signed-off-by: Andreas F=C3=A4rber --- hw/pci-bridge/pci_bridge_dev.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_de= v.c index af750c2..a9392c7 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -27,8 +27,15 @@ #include "exec/memory.h" #include "hw/pci/pci_bus.h" =20 +#define TYPE_PCI_BRIDGE_DEV "pci-bridge" +#define PCI_BRIDGE_DEV(obj) \ + OBJECT_CHECK(PCIBridgeDev, (obj), TYPE_PCI_BRIDGE_DEV) + struct PCIBridgeDev { - PCIBridge bridge; + /*< private >*/ + PCIBridge parent_obj; + /*< public >*/ + MemoryRegion bar; uint8_t chassis_nr; #define PCI_BRIDGE_DEV_F_MSI_REQ 0 @@ -39,7 +46,7 @@ typedef struct PCIBridgeDev PCIBridgeDev; static int pci_bridge_dev_initfn(PCIDevice *dev) { PCIBridge *br =3D PCI_BRIDGE(dev); - PCIBridgeDev *bridge_dev =3D DO_UPCAST(PCIBridgeDev, bridge, br); + PCIBridgeDev *bridge_dev =3D PCI_BRIDGE_DEV(dev); int err; =20 err =3D pci_bridge_initfn(dev, TYPE_PCI_BUS); @@ -81,8 +88,7 @@ bridge_error: =20 static void pci_bridge_dev_exitfn(PCIDevice *dev) { - PCIBridge *br =3D PCI_BRIDGE(dev); - PCIBridgeDev *bridge_dev =3D DO_UPCAST(PCIBridgeDev, bridge, br); + PCIBridgeDev *bridge_dev =3D PCI_BRIDGE_DEV(dev); if (msi_present(dev)) { msi_uninit(dev); } @@ -104,7 +110,7 @@ static void pci_bridge_dev_write_config(PCIDevice *d, =20 static void qdev_pci_bridge_dev_reset(DeviceState *qdev) { - PCIDevice *dev =3D DO_UPCAST(PCIDevice, qdev, qdev); + PCIDevice *dev =3D PCI_DEVICE(qdev); =20 pci_bridge_reset(qdev); shpc_reset(dev); @@ -120,8 +126,8 @@ static Property pci_bridge_dev_properties[] =3D { static const VMStateDescription pci_bridge_dev_vmstate =3D { .name =3D "pci_bridge", .fields =3D (VMStateField[]) { - VMSTATE_PCI_DEVICE(bridge.parent_obj, PCIBridgeDev), - SHPC_VMSTATE(bridge.parent_obj.shpc, PCIBridgeDev), + VMSTATE_PCI_DEVICE(parent_obj, PCIBridge), + SHPC_VMSTATE(shpc, PCIDevice), VMSTATE_END_OF_LIST() } }; @@ -145,7 +151,7 @@ static void pci_bridge_dev_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo pci_bridge_dev_info =3D { - .name =3D "pci-bridge", + .name =3D TYPE_PCI_BRIDGE_DEV, .parent =3D TYPE_PCI_BRIDGE, .instance_size =3D sizeof(PCIBridgeDev), .class_init =3D pci_bridge_dev_class_init, --=20 1.8.1.4