From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmTFB-0000lM-2l for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:20:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmTF5-0004Yj-NJ for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:20:00 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 4 Jul 2012 19:19:32 +0200 Message-Id: <1341422373-13614-14-git-send-email-afaerber@suse.de> In-Reply-To: <1341422373-13614-1-git-send-email-afaerber@suse.de> References: <1341422373-13614-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] [PATCH v3 13/14] pci: Derive PCI host bridges from TYPE_PCI_HOST_BRIDGE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, jbaron@redhat.com, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:New World" , anthony@codemonkey.ws, pbonzini@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Some typedef'ed their state to PCIHostState. Use a proper struct, and use PCIHostState and PCI_HOST_BRIDGE() where appropriate. Signed-off-by: Andreas F=C3=A4rber --- hw/alpha_typhoon.c | 2 +- hw/bonito.c | 22 +++++++++++----------- hw/dec_pci.c | 4 ++-- hw/grackle_pci.c | 6 +++--- hw/gt64xxx.c | 4 ++-- hw/piix_pci.c | 8 ++++---- hw/ppc4xx_pci.c | 4 ++-- hw/ppc_prep.c | 4 +--- hw/ppce500_pci.c | 4 ++-- hw/prep_pci.c | 4 ++-- hw/spapr_pci.c | 2 +- hw/unin_pci.c | 20 ++++++++++---------- 12 files changed, 41 insertions(+), 43 deletions(-) diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c index 06e84a1..58025a3 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -823,7 +823,7 @@ static void typhoon_pcihost_class_init(ObjectClass *k= lass, void *data) =20 static const TypeInfo typhoon_pcihost_info =3D { .name =3D TYPE_TYPHOON_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(TyphoonState), .class_init =3D typhoon_pcihost_class_init, }; diff --git a/hw/bonito.c b/hw/bonito.c index 062c701..6084ac4 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -416,7 +416,7 @@ static const MemoryRegionOps bonito_cop_ops =3D { static uint32_t bonito_sbridge_pciaddr(void *opaque, target_phys_addr_t = addr) { PCIBonitoState *s =3D opaque; - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, SYS_BUS_DEVICE(s->pc= ihost)); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t cfgaddr; uint32_t idsel; uint32_t devno; @@ -454,7 +454,7 @@ static void bonito_spciconf_writeb(void *opaque, targ= et_phys_addr_t addr, { PCIBonitoState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, SYS_BUS_DEVICE(s->pc= ihost)); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; uint16_t status; =20 @@ -480,7 +480,7 @@ static void bonito_spciconf_writew(void *opaque, targ= et_phys_addr_t addr, { PCIBonitoState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, SYS_BUS_DEVICE(s->pc= ihost)); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; uint16_t status; =20 @@ -508,7 +508,7 @@ static void bonito_spciconf_writel(void *opaque, targ= et_phys_addr_t addr, { PCIBonitoState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, SYS_BUS_DEVICE(s->pc= ihost)); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; uint16_t status; =20 @@ -535,7 +535,7 @@ static uint32_t bonito_spciconf_readb(void *opaque, t= arget_phys_addr_t addr) { PCIBonitoState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, SYS_BUS_DEVICE(s->pc= ihost)); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; uint16_t status; =20 @@ -561,7 +561,7 @@ static uint32_t bonito_spciconf_readw(void *opaque, t= arget_phys_addr_t addr) { PCIBonitoState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, SYS_BUS_DEVICE(s->pc= ihost)); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; uint16_t status; =20 @@ -589,7 +589,7 @@ static uint32_t bonito_spciconf_readl(void *opaque, t= arget_phys_addr_t addr) { PCIBonitoState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, SYS_BUS_DEVICE(s->pc= ihost)); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; uint16_t status; =20 @@ -702,7 +702,7 @@ static const VMStateDescription vmstate_bonito =3D { =20 static int bonito_pcihost_initfn(SysBusDevice *dev) { - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, dev); + PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); =20 phb->bus =3D pci_register_bus(DEVICE(dev), "pci", pci_bonito_set_irq, pci_bonito_map_irq, = dev, @@ -716,7 +716,7 @@ static int bonito_initfn(PCIDevice *dev) { PCIBonitoState *s =3D DO_UPCAST(PCIBonitoState, dev, dev); SysBusDevice *sysbus =3D SYS_BUS_DEVICE(s->pcihost); - PCIHostState *phb =3D FROM_SYSBUS(PCIHostState, sysbus); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); =20 /* Bonito North Bridge, built on FPGA, VENDOR_ID/DEVICE_ID are "unde= fined" */ pci_config_set_prog_interface(dev->config, 0x00); @@ -785,7 +785,7 @@ PCIBus *bonito_init(qemu_irq *pic) PCIDevice *d; =20 dev =3D qdev_create(NULL, TYPE_BONITO_PCI_HOST_BRIDGE); - phb =3D FROM_SYSBUS(PCIHostState, sysbus_from_qdev(dev)); + phb =3D PCI_HOST_BRIDGE(dev); pcihost =3D BONITO_PCI_HOST_BRIDGE(dev); pcihost->pic =3D pic; qdev_init_nofail(dev); @@ -833,7 +833,7 @@ static void bonito_pcihost_class_init(ObjectClass *kl= ass, void *data) =20 static const TypeInfo bonito_pcihost_info =3D { .name =3D TYPE_BONITO_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(BonitoState), .class_init =3D bonito_pcihost_class_init, }; diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 19aed1b..de16361 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -91,7 +91,7 @@ static int pci_dec_21154_device_init(SysBusDevice *dev) { PCIHostState *phb; =20 - phb =3D FROM_SYSBUS(PCIHostState, dev); + phb =3D PCI_HOST_BRIDGE(dev); =20 memory_region_init_io(&phb->conf_mem, &pci_host_conf_le_ops, dev, "pci-conf-idx", 0x1000); @@ -136,7 +136,7 @@ static void pci_dec_21154_device_class_init(ObjectCla= ss *klass, void *data) =20 static const TypeInfo pci_dec_21154_device_info =3D { .name =3D TYPE_DEC_21154, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(DECState), .class_init =3D pci_dec_21154_device_class_init, }; diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index d814270..066f6e1 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -73,7 +73,7 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic, dev =3D qdev_create(NULL, TYPE_GRACKLE_PCI_HOST_BRIDGE); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); - phb =3D FROM_SYSBUS(PCIHostState, s); + phb =3D PCI_HOST_BRIDGE(dev); d =3D GRACKLE_PCI_HOST_BRIDGE(dev); =20 memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL); @@ -102,7 +102,7 @@ static int pci_grackle_init_device(SysBusDevice *dev) { PCIHostState *phb; =20 - phb =3D FROM_SYSBUS(PCIHostState, dev); + phb =3D PCI_HOST_BRIDGE(dev); =20 memory_region_init_io(&phb->conf_mem, &pci_host_conf_le_ops, dev, "pci-conf-idx", 0x1000); @@ -151,7 +151,7 @@ static void pci_grackle_class_init(ObjectClass *klass= , void *data) =20 static const TypeInfo grackle_pci_host_info =3D { .name =3D TYPE_GRACKLE_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(GrackleState), .class_init =3D pci_grackle_class_init, }; diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 0677299..857758e 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -1095,7 +1095,7 @@ PCIBus *gt64120_register(qemu_irq *pic) dev =3D qdev_create(NULL, TYPE_GT64120_PCI_HOST_BRIDGE); qdev_init_nofail(dev); d =3D GT64120_PCI_HOST_BRIDGE(dev); - phb =3D &d->pci; + phb =3D PCI_HOST_BRIDGE(dev); phb->bus =3D pci_register_bus(dev, "pci", gt64120_pci_set_irq, gt64120_pci_map_irq= , pic, @@ -1168,7 +1168,7 @@ static void gt64120_class_init(ObjectClass *klass, = void *data) =20 static const TypeInfo gt64120_info =3D { .name =3D TYPE_GT64120_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(GT64120State), .class_init =3D gt64120_class_init, }; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 5db4026..0523d81 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -224,7 +224,7 @@ static const VMStateDescription vmstate_i440fx =3D { =20 static int i440fx_pcihost_initfn(SysBusDevice *dev) { - I440FXState *s =3D FROM_SYSBUS(I440FXState, dev); + PCIHostState *s =3D PCI_HOST_BRIDGE(dev); =20 memory_region_init_io(&s->conf_mem, &pci_host_conf_le_ops, s, "pci-conf-idx", 4); @@ -266,12 +266,12 @@ static PCIBus *i440fx_common_init(const char *devic= e_name, DeviceState *dev; PCIBus *b; PCIDevice *d; - I440FXState *s; + PCIHostState *s; PIIX3State *piix3; PCII440FXState *f; =20 dev =3D qdev_create(NULL, "i440FX-pcihost"); - s =3D FROM_SYSBUS(I440FXState, sysbus_from_qdev(dev)); + s =3D PCI_HOST_BRIDGE(dev); s->address_space =3D address_space_mem; b =3D pci_bus_new(&s->busdev.qdev, NULL, pci_address_space, address_space_io, 0); @@ -583,7 +583,7 @@ static void i440fx_pcihost_class_init(ObjectClass *kl= ass, void *data) =20 static const TypeInfo i440fx_pcihost_info =3D { .name =3D "i440FX-pcihost", - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(I440FXState), .class_init =3D i440fx_pcihost_class_init, }; diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 599a75a..5583321 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -338,7 +338,7 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev) PCIBus *b; int i; =20 - h =3D FROM_SYSBUS(PCIHostState, dev); + h =3D PCI_HOST_BRIDGE(dev); s =3D PPC4xx_PCI_HOST_BRIDGE(dev); =20 for (i =3D 0; i < ARRAY_SIZE(s->irq); i++) { @@ -398,7 +398,7 @@ static void ppc4xx_pcihost_class_init(ObjectClass *kl= ass, void *data) =20 static const TypeInfo ppc4xx_pcihost_info =3D { .name =3D TYPE_PPC4xx_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(PPC4xxPCIState), .class_init =3D ppc4xx_pcihost_class_init, }; diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index be2b268..1544430 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -470,7 +470,6 @@ static void ppc_prep_init (ram_addr_t ram_size, uint32_t kernel_base, initrd_base; long kernel_size, initrd_size; DeviceState *dev; - SysBusDevice *sys; PCIHostState *pcihost; PCIBus *pci_bus; PCIDevice *pci; @@ -583,8 +582,7 @@ static void ppc_prep_init (ram_addr_t ram_size, } =20 dev =3D qdev_create(NULL, "raven-pcihost"); - sys =3D sysbus_from_qdev(dev); - pcihost =3D DO_UPCAST(PCIHostState, busdev, sys); + pcihost =3D PCI_HOST_BRIDGE(dev); pcihost->address_space =3D get_system_memory(); object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), = NULL); qdev_init_nofail(dev); diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index e4f065a..3333967 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -316,7 +316,7 @@ static int e500_pcihost_initfn(SysBusDevice *dev) MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *address_space_io =3D get_system_io(); =20 - h =3D FROM_SYSBUS(PCIHostState, dev); + h =3D PCI_HOST_BRIDGE(dev); s =3D PPC_E500_PCI_HOST_BRIDGE(dev); =20 for (i =3D 0; i < ARRAY_SIZE(s->irq); i++) { @@ -374,7 +374,7 @@ static void e500_pcihost_class_init(ObjectClass *klas= s, void *data) =20 static const TypeInfo e500_pcihost_info =3D { .name =3D TYPE_PPC_E500_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(PPCE500PCIState), .class_init =3D e500_pcihost_class_init, }; diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 69c19df..35cb9b2 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -103,7 +103,7 @@ static void prep_set_irq(void *opaque, int irq_num, i= nt level) =20 static int raven_pcihost_init(SysBusDevice *dev) { - PCIHostState *h =3D FROM_SYSBUS(PCIHostState, dev); + PCIHostState *h =3D PCI_HOST_BRIDGE(dev); PREPPCIState *s =3D RAVEN_PCI_HOST_BRIDGE(dev); MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *address_space_io =3D get_system_io(); @@ -192,7 +192,7 @@ static void raven_pcihost_class_init(ObjectClass *kla= ss, void *data) =20 static const TypeInfo raven_pcihost_info =3D { .name =3D TYPE_RAVEN_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(PREPPCIState), .class_init =3D raven_pcihost_class_init, }; diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index dd2a72d..7d84801 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -370,7 +370,7 @@ static void spapr_phb_class_init(ObjectClass *klass, = void *data) =20 static const TypeInfo spapr_phb_info =3D { .name =3D TYPE_SPAPR_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(sPAPRPHBState), .class_init =3D spapr_phb_class_init, }; diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 1fc8920..0db7c1f 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -148,7 +148,7 @@ static int pci_unin_main_init_device(SysBusDevice *de= v) =20 /* Use values found on a real PowerMac */ /* Uninorth main bus */ - h =3D FROM_SYSBUS(PCIHostState, dev); + h =3D PCI_HOST_BRIDGE(dev); =20 memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, dev, "pci-conf-idx", 0x1000); @@ -166,7 +166,7 @@ static int pci_u3_agp_init_device(SysBusDevice *dev) PCIHostState *h; =20 /* Uninorth U3 AGP bus */ - h =3D FROM_SYSBUS(PCIHostState, dev); + h =3D PCI_HOST_BRIDGE(dev); =20 memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, dev, "pci-conf-idx", 0x1000); @@ -183,7 +183,7 @@ static int pci_unin_agp_init_device(SysBusDevice *dev= ) PCIHostState *h; =20 /* Uninorth AGP bus */ - h =3D FROM_SYSBUS(PCIHostState, dev); + h =3D PCI_HOST_BRIDGE(dev); =20 memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, dev, "pci-conf-idx", 0x1000); @@ -199,7 +199,7 @@ static int pci_unin_internal_init_device(SysBusDevice= *dev) PCIHostState *h; =20 /* Uninorth internal bus */ - h =3D FROM_SYSBUS(PCIHostState, dev); + h =3D PCI_HOST_BRIDGE(dev); =20 memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, dev, "pci-conf-idx", 0x1000); @@ -224,7 +224,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic, dev =3D qdev_create(NULL, TYPE_UNI_NORTH_PCI_HOST_BRIDGE); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); - h =3D FROM_SYSBUS(PCIHostState, s); + h =3D PCI_HOST_BRIDGE(s); d =3D UNI_NORTH_PCI_HOST_BRIDGE(dev); memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL); memory_region_init_alias(&d->pci_hole, "pci-hole", &d->pci_mmio, @@ -289,7 +289,7 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic, dev =3D qdev_create(NULL, TYPE_U3_AGP_HOST_BRIDGE); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); - h =3D FROM_SYSBUS(PCIHostState, s); + h =3D PCI_HOST_BRIDGE(dev); d =3D U3_AGP_HOST_BRIDGE(dev); =20 memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL); @@ -427,7 +427,7 @@ static void pci_unin_main_class_init(ObjectClass *kla= ss, void *data) =20 static const TypeInfo pci_unin_main_info =3D { .name =3D TYPE_UNI_NORTH_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_unin_main_class_init, }; @@ -441,7 +441,7 @@ static void pci_u3_agp_class_init(ObjectClass *klass,= void *data) =20 static const TypeInfo pci_u3_agp_info =3D { .name =3D TYPE_U3_AGP_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_u3_agp_class_init, }; @@ -455,7 +455,7 @@ static void pci_unin_agp_class_init(ObjectClass *klas= s, void *data) =20 static const TypeInfo pci_unin_agp_info =3D { .name =3D TYPE_UNI_NORTH_AGP_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_unin_agp_class_init, }; @@ -469,7 +469,7 @@ static void pci_unin_internal_class_init(ObjectClass = *klass, void *data) =20 static const TypeInfo pci_unin_internal_info =3D { .name =3D TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE, - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_unin_internal_class_init, }; --=20 1.7.7