[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/84] pnv/psi: Correct the pnv-psi* devices not to be sysbus devi
From: |
Markus Armbruster |
Subject: |
[PULL 19/84] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices |
Date: |
Mon, 15 Jun 2020 22:39:03 +0200 |
pnv_chip_power8_instance_init() creates a "pnv-psi-POWER8" sysbus
device in a way that leaves it unplugged.
pnv_chip_power9_instance_init() and pnv_chip_power10_instance_init()
do the same for "pnv-psi-POWER9" and "pnv-psi-POWER10", respectively.
These devices aren't actually sysbus devices. Correct that.
Cc: "Cédric Le Goater" <clg@kaod.org>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20200609122339.937862-18-armbru@redhat.com>
---
include/hw/ppc/pnv_psi.h | 2 +-
hw/ppc/pnv_psi.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h
index f0f5b55197..979fc59f33 100644
--- a/include/hw/ppc/pnv_psi.h
+++ b/include/hw/ppc/pnv_psi.h
@@ -31,7 +31,7 @@
#define PSIHB_XSCOM_MAX 0x20
typedef struct PnvPsi {
- SysBusDevice parent;
+ DeviceState parent;
MemoryRegion regs_mr;
uint64_t bar;
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index cfd5b7bc25..82f0769465 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -943,7 +943,7 @@ static void pnv_psi_class_init(ObjectClass *klass, void
*data)
static const TypeInfo pnv_psi_info = {
.name = TYPE_PNV_PSI,
- .parent = TYPE_SYS_BUS_DEVICE,
+ .parent = TYPE_DEVICE,
.instance_size = sizeof(PnvPsi),
.class_init = pnv_psi_class_init,
.class_size = sizeof(PnvPsiClass),
--
2.26.2
- [PULL 02/84] qom: Make "info qom-tree" show children sorted, (continued)
- [PULL 02/84] qom: Make "info qom-tree" show children sorted, Markus Armbruster, 2020/06/15
- [PULL 06/84] arm/aspeed: Compute the number of CPUs from the SoC definition, Markus Armbruster, 2020/06/15
- [PULL 04/84] display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge", Markus Armbruster, 2020/06/15
- [PULL 07/84] arm/aspeed: Rework NIC attachment, Markus Armbruster, 2020/06/15
- [PULL 05/84] sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device, Markus Armbruster, 2020/06/15
- [PULL 16/84] macio: Put "macio-nvram" device on the macio bus, Markus Armbruster, 2020/06/15
- [PULL 10/84] mac_via: Fix to realize "mos6522-q800-via*" devices, Markus Armbruster, 2020/06/15
- [PULL 09/84] auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave, Markus Armbruster, 2020/06/15
- [PULL 24/84] qdev: Assert devices are plugged into a bus that can take them, Markus Armbruster, 2020/06/15
- [PULL 22/84] riscv: Fix type of SiFive[EU]SocState, member parent_obj, Markus Armbruster, 2020/06/15
- [PULL 19/84] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices,
Markus Armbruster <=
- [PULL 27/84] qdev: Rename qbus_realize() to qbus_init(), Markus Armbruster, 2020/06/15
- [PULL 11/84] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices, Markus Armbruster, 2020/06/15
- [PULL 15/84] ppc4xx: Drop redundant device realization, Markus Armbruster, 2020/06/15
- [PULL 14/84] MAINTAINERS: Make section PowerNV cover pci-host/pnv* as well, Markus Armbruster, 2020/06/15
- [PULL 17/84] macio: Fix macio-bus to be a subtype of System bus, Markus Armbruster, 2020/06/15
- [PULL 31/84] qdev: Put qdev_new() to use with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 08/84] armv7m: Delete unused "ARM,bitband-memory" devices, Markus Armbruster, 2020/06/15
- [PULL 35/84] qdev: Convert uses of qdev_create() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 21/84] riscv: Fix to put "riscv.hart_array" devices on sysbus, Markus Armbruster, 2020/06/15
- [PULL 03/84] arm/stm32f405: Fix realization of "stm32f2xx-adc" devices, Markus Armbruster, 2020/06/15