Skip to content

Commit

Permalink
ppc4xx_pci: Add define for ppc4xx-host-bridge type name
Browse files Browse the repository at this point in the history
Add a QOM type name define for ppc4xx-host-bridge in the common header
and replace direct use of the string name with the constant.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-ID: <f6e2956b3a09ee481b970ef7873b374c846ba0a8.1688641673.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
  • Loading branch information
zbalaton authored and danielhb committed Jul 7, 2023
1 parent e75a951 commit 2460bdf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion hw/ppc/ppc440_pcix.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,8 @@ static void ppc440_pcix_realize(DeviceState *dev, Error **errp)
ppc440_pcix_map_irq, &s->irq, &s->busmem, &s->iomem,
PCI_DEVFN(0, 0), 1, TYPE_PCI_BUS);

s->dev = pci_create_simple(h->bus, PCI_DEVFN(0, 0), "ppc4xx-host-bridge");
s->dev = pci_create_simple(h->bus, PCI_DEVFN(0, 0),
TYPE_PPC4xx_HOST_BRIDGE);

memory_region_init(&s->bm, OBJECT(s), "bm-ppc440-pcix", UINT64_MAX);
memory_region_add_subregion(&s->bm, 0x0, &s->busmem);
Expand Down
4 changes: 2 additions & 2 deletions hw/ppc/ppc4xx_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Error **errp)
TYPE_PCI_BUS);
h->bus = b;

pci_create_simple(b, 0, "ppc4xx-host-bridge");
pci_create_simple(b, 0, TYPE_PPC4xx_HOST_BRIDGE);

/* XXX split into 2 memory regions, one for config space, one for regs */
memory_region_init(&s->container, OBJECT(s), "pci-container", PCI_ALL_SIZE);
Expand Down Expand Up @@ -367,7 +367,7 @@ static void ppc4xx_host_bridge_class_init(ObjectClass *klass, void *data)
}

static const TypeInfo ppc4xx_host_bridge_info = {
.name = "ppc4xx-host-bridge",
.name = TYPE_PPC4xx_HOST_BRIDGE,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIDevice),
.class_init = ppc4xx_host_bridge_class_init,
Expand Down
1 change: 1 addition & 0 deletions include/hw/ppc/ppc4xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "exec/memory.h"
#include "hw/sysbus.h"

#define TYPE_PPC4xx_HOST_BRIDGE "ppc4xx-host-bridge"
#define TYPE_PPC4xx_PCI_HOST "ppc4xx-pci-host"
#define TYPE_PPC460EX_PCIE_HOST "ppc460ex-pcie-host"

Expand Down

0 comments on commit 2460bdf

Please sign in to comment.