mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xive: Link "xive" property to XiveSource::xive pointer

Browse Source 
The source object has both a pointer and a "xive" property pointing to the
notifier object. Confusing bugs could arise if these ever go out of sync.

Change the property definition so that it explicitely sets the pointer.
The property isn't optional : not being able to set the link is a bug
and QEMU should rather abort than exit in this case.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <157383333227.165747.12901571295951957951.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2019-11-15 16:55:32 +01:00 committed by David Gibson
parent 411c2a619e
commit 82ea3a1b29
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/pnv_xive.c
View File

@ -1695,8 +1695,8 @@ static void pnv_xive_realize(DeviceState *dev, Error **errp)
*/ */
object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs", object_property_set_int(OBJECT(xsrc), PNV_XIVE_NR_IRQS, "nr-irqs",
&error_fatal); &error_fatal);
object_property_add_const_link(OBJECT(xsrc), "xive", OBJECT(xive), object_property_set_link(OBJECT(xsrc), OBJECT(xive), "xive",
&error_fatal); &error_abort);
object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err); object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);

4
hw/intc/spapr_xive.c
View File

@ -276,8 +276,8 @@ static void spapr_xive_realize(DeviceState *dev, Error **errp)
*/ */
object_property_set_int(OBJECT(xsrc), xive->nr_irqs, "nr-irqs", object_property_set_int(OBJECT(xsrc), xive->nr_irqs, "nr-irqs",
&error_fatal); &error_fatal);
object_property_add_const_link(OBJECT(xsrc), "xive", OBJECT(xive), object_property_set_link(OBJECT(xsrc), OBJECT(xive), "xive",
&error_fatal); &error_abort);
object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err); object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);

13
hw/intc/xive.c
View File

@ -1060,17 +1060,8 @@ static void xive_source_reset(void *dev)
static void xive_source_realize(DeviceState *dev, Error **errp) static void xive_source_realize(DeviceState *dev, Error **errp)
{ {
XiveSource *xsrc = XIVE_SOURCE(dev); XiveSource *xsrc = XIVE_SOURCE(dev);
Object *obj;
Error *local_err = NULL;
obj = object_property_get_link(OBJECT(dev), "xive", &local_err); assert(xsrc->xive);
if (!obj) {
error_propagate(errp, local_err);
error_prepend(errp, "required link 'xive' not found: ");
return;
}
xsrc->xive = XIVE_NOTIFIER(obj);
if (!xsrc->nr_irqs) { if (!xsrc->nr_irqs) {
error_setg(errp, "Number of interrupt needs to be greater than 0"); error_setg(errp, "Number of interrupt needs to be greater than 0");
@ -1116,6 +1107,8 @@ static Property xive_source_properties[] = {
DEFINE_PROP_UINT64("flags", XiveSource, esb_flags, 0), DEFINE_PROP_UINT64("flags", XiveSource, esb_flags, 0),
DEFINE_PROP_UINT32("nr-irqs", XiveSource, nr_irqs, 0), DEFINE_PROP_UINT32("nr-irqs", XiveSource, nr_irqs, 0),
DEFINE_PROP_UINT32("shift", XiveSource, esb_shift, XIVE_ESB_64K_2PAGE), DEFINE_PROP_UINT32("shift", XiveSource, esb_shift, XIVE_ESB_64K_2PAGE),
DEFINE_PROP_LINK("xive", XiveSource, xive, TYPE_XIVE_NOTIFIER,
XiveNotifier *),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

3
hw/ppc/pnv_psi.c
View File

@ -851,8 +851,7 @@ static void pnv_psi_power9_realize(DeviceState *dev, Error **errp)
&error_fatal); &error_fatal);
object_property_set_int(OBJECT(xsrc), PSIHB9_NUM_IRQS, "nr-irqs", object_property_set_int(OBJECT(xsrc), PSIHB9_NUM_IRQS, "nr-irqs",
&error_fatal); &error_fatal);
object_property_add_const_link(OBJECT(xsrc), "xive", OBJECT(psi), object_property_set_link(OBJECT(xsrc), OBJECT(psi), "xive", &error_abort);
&error_fatal);
object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err); object_property_set_bool(OBJECT(xsrc), true, "realized", &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);