[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/24] pnv/psi: Correct the pnv-psi* devices not to be sysbus
From: |
Markus Armbruster |
Subject: |
[PATCH v2 17/24] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices |
Date: |
Thu, 28 May 2020 13:04:37 +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>
---
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.21.3
- [PATCH v2 08/24] mac_via: Fix to realize "mos6522-q800-via*" devices, (continued)
- [PATCH v2 08/24] mac_via: Fix to realize "mos6522-q800-via*" devices, Markus Armbruster, 2020/05/28
- [PATCH v2 13/24] ppc4xx: Drop redundant device realization, Markus Armbruster, 2020/05/28
- [PATCH v2 14/24] macio: Put "macio-nvram" device on the macio bus, Markus Armbruster, 2020/05/28
- [PATCH v2 18/24] display/sm501 display/ati: Fix to realize "i2c-ddc", Markus Armbruster, 2020/05/28
- [PATCH v2 11/24] pnv/phb4: Delete unused "pnv-phb4-pec-stack" devices, Markus Armbruster, 2020/05/28
- [PATCH v2 05/24] arm/aspeed: Rework NIC attachment, Markus Armbruster, 2020/05/28
- [PATCH v2 03/24] sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device, Markus Armbruster, 2020/05/28
- [PATCH v2 07/24] auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave, Markus Armbruster, 2020/05/28
- [PATCH v2 22/24] qdev: Assert devices are plugged into a bus that can take them, Markus Armbruster, 2020/05/28
- [PATCH v2 17/24] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices,
Markus Armbruster <=
- [PATCH v2 09/24] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices, Markus Armbruster, 2020/05/28
- [PATCH v2 23/24] sd: Hide the qdev-but-not-quite thing created by sd_init(), Markus Armbruster, 2020/05/28
- [PATCH v2 20/24] riscv: Fix type of SiFive[EU]SocState, member parent_obj, Markus Armbruster, 2020/05/28
- [PATCH v2 04/24] arm/aspeed: Compute the number of CPUs from the SoC definition, Markus Armbruster, 2020/05/28
- [PATCH v2 15/24] macio: Fix macio-bus to be a subtype of System bus, Markus Armbruster, 2020/05/28
- [PATCH v2 16/24] ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bus, Markus Armbruster, 2020/05/28
- [PATCH v2 24/24] qdev: Assert onboard devices all get realized properly, Markus Armbruster, 2020/05/28
- [PATCH v2 10/24] macio: Delete unused "macio-gpio" devices, Markus Armbruster, 2020/05/28
- [PATCH v2 21/24] sparc/leon3: Fix to put grlib,* devices on sysbus, Markus Armbruster, 2020/05/28
- [PATCH v2 19/24] riscv: Fix to put "riscv.hart_array" devices on sysbus, Markus Armbruster, 2020/05/28