[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 for-5.0 8/8] ppc/pnv: Link "chip" property to PnvXive::chip po
From: |
Greg Kurz |
Subject: |
[PATCH v2 for-5.0 8/8] ppc/pnv: Link "chip" property to PnvXive::chip pointer |
Date: |
Fri, 15 Nov 2019 16:56:05 +0100 |
User-agent: |
StGit/unknown-version |
The XIVE object has both a pointer and a "chip" property pointing to the
chip object. Confusing bugs could arise if these ever go out of sync.
Change the property definition so that it explicitely sets the pointer.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/intc/pnv_xive.c | 13 +++----------
hw/ppc/pnv.c | 4 ++--
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index 6aa7aeed6f83..4e56c2e4689c 100644
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -1675,17 +1675,8 @@ static void pnv_xive_realize(DeviceState *dev, Error
**errp)
XiveSource *xsrc = &xive->ipi_source;
XiveENDSource *end_xsrc = &xive->end_source;
Error *local_err = NULL;
- Object *obj;
- obj = object_property_get_link(OBJECT(dev), "chip", &local_err);
- if (!obj) {
- error_propagate(errp, local_err);
- error_prepend(errp, "required link 'chip' not found: ");
- return;
- }
-
- /* The PnvChip id identifies the XIVE interrupt controller. */
- xive->chip = PNV_CHIP(obj);
+ assert(xive->chip);
/*
* The XiveSource and XiveENDSource objects are realized with the
@@ -1800,6 +1791,8 @@ static Property pnv_xive_properties[] = {
DEFINE_PROP_UINT64("vc-bar", PnvXive, vc_base, 0),
DEFINE_PROP_UINT64("pc-bar", PnvXive, pc_base, 0),
DEFINE_PROP_UINT64("tm-bar", PnvXive, tm_base, 0),
+ /* The PnvChip id identifies the XIVE interrupt controller. */
+ DEFINE_PROP_LINK("chip", PnvXive, chip, TYPE_PNV_CHIP, PnvChip *),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 8851875bcfd7..d7130c3304f0 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1088,8 +1088,6 @@ static void pnv_chip_power9_instance_init(Object *obj)
object_initialize_child(obj, "xive", &chip9->xive, sizeof(chip9->xive),
TYPE_PNV_XIVE, &error_abort, NULL);
- object_property_add_const_link(OBJECT(&chip9->xive), "chip", obj,
- &error_abort);
object_initialize_child(obj, "psi", &chip9->psi, sizeof(chip9->psi),
TYPE_PNV9_PSI, &error_abort, NULL);
@@ -1171,6 +1169,8 @@ static void pnv_chip_power9_realize(DeviceState *dev,
Error **errp)
"pc-bar", &error_fatal);
object_property_set_int(OBJECT(&chip9->xive), PNV9_XIVE_TM_BASE(chip),
"tm-bar", &error_fatal);
+ object_property_set_link(OBJECT(&chip9->xive), OBJECT(chip), "chip",
+ &error_abort);
object_property_set_bool(OBJECT(&chip9->xive), true, "realized",
&local_err);
if (local_err) {
- [PATCH v2 for-5.0 0/8] ppc: Consolidate QOM links and pointers to the same object, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 1/8] xive: Link "cpu" property to XiveTCTX::cs pointer, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 2/8] xive: Link "xive" property to XiveSource::xive pointer, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 3/8] xive: Link "xive" property to XiveEndSource::xrtr pointer, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 4/8] ppc/pnv: Link "psi" property to PnvLpc::psi pointer, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 5/8] ppc/pnv: Link "psi" property to PnvOCC::psi pointer, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 6/8] ppc/pnv: Link "chip" property to PnvHomer::chip pointer, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 7/8] ppc/pnv: Link "chip" property to PnvCore::chip pointer, Greg Kurz, 2019/11/15
- [PATCH v2 for-5.0 8/8] ppc/pnv: Link "chip" property to PnvXive::chip pointer,
Greg Kurz <=
- Re: [PATCH v2 for-5.0 0/8] ppc: Consolidate QOM links and pointers to the same object, David Gibson, 2019/11/15
- Re: [PATCH v2 for-5.0 0/8] ppc: Consolidate QOM links and pointers to the same object, Markus Armbruster, 2019/11/18