SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ppc/pnv: Complete user created PHB3 devices

Browse Source 
PHB3s ared SysBus devices and should be allowed to be dynamically
created.

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220105212338.49899-9-danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Cédric Le Goater 2022-01-12 11:28:27 +01:00
parent c29dd0034d
commit db041b06e6
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/pci-host/pnv_phb3.c
View File

@ -993,6 +993,9 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp)
/* User created devices */ /* User created devices */
if (!phb->chip) { if (!phb->chip) {
Error *local_err = NULL;
BusState *s;
phb->chip = pnv_get_chip(pnv, phb->chip_id); phb->chip = pnv_get_chip(pnv, phb->chip_id);
if (!phb->chip) { if (!phb->chip) {
error_setg(errp, "invalid chip id: %d", phb->chip_id); error_setg(errp, "invalid chip id: %d", phb->chip_id);
@ -1004,6 +1007,12 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp)
* correctly the device tree. * correctly the device tree.
*/ */
pnv_chip_parent_fixup(phb->chip, OBJECT(phb), phb->phb_id); pnv_chip_parent_fixup(phb->chip, OBJECT(phb), phb->phb_id);
s = qdev_get_parent_bus(DEVICE(phb->chip));
if (!qdev_set_parent_bus(DEVICE(phb), s, &local_err)) {
error_propagate(errp, local_err);
return;
}
} }
if (phb->phb_id >= PNV_CHIP_GET_CLASS(phb->chip)->num_phbs) { if (phb->phb_id >= PNV_CHIP_GET_CLASS(phb->chip)->num_phbs) {

2
hw/ppc/pnv.c
View File

@ -1941,6 +1941,8 @@ static void pnv_machine_power8_class_init(ObjectClass *oc, void *data)
pmc->compat = compat; pmc->compat = compat;
pmc->compat_size = sizeof(compat); pmc->compat_size = sizeof(compat);
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB3);
} }
static void pnv_machine_power9_class_init(ObjectClass *oc, void *data) static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)