xive: Link "xive" property to XiveEndSource::xrtr pointer
The END source object has both a pointer and a "xive" property pointing to the router 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: <157383333784.165747.5298512574054268786.stgit@bahia.lan> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
82ea3a1b29
commit
0ab2316e9e
|
@ -1705,8 +1705,8 @@ static void pnv_xive_realize(DeviceState *dev, Error **errp)
|
|||
|
||||
object_property_set_int(OBJECT(end_xsrc), PNV_XIVE_NR_ENDS, "nr-ends",
|
||||
&error_fatal);
|
||||
object_property_add_const_link(OBJECT(end_xsrc), "xive", OBJECT(xive),
|
||||
&error_fatal);
|
||||
object_property_set_link(OBJECT(end_xsrc), OBJECT(xive), "xive",
|
||||
&error_abort);
|
||||
object_property_set_bool(OBJECT(end_xsrc), true, "realized", &local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
|
@ -290,8 +290,8 @@ static void spapr_xive_realize(DeviceState *dev, Error **errp)
|
|||
*/
|
||||
object_property_set_int(OBJECT(end_xsrc), xive->nr_irqs, "nr-ends",
|
||||
&error_fatal);
|
||||
object_property_add_const_link(OBJECT(end_xsrc), "xive", OBJECT(xive),
|
||||
&error_fatal);
|
||||
object_property_set_link(OBJECT(end_xsrc), OBJECT(xive), "xive",
|
||||
&error_abort);
|
||||
object_property_set_bool(OBJECT(end_xsrc), true, "realized", &local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
|
@ -1814,17 +1814,8 @@ static const MemoryRegionOps xive_end_source_ops = {
|
|||
static void xive_end_source_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
XiveENDSource *xsrc = XIVE_END_SOURCE(dev);
|
||||
Object *obj;
|
||||
Error *local_err = NULL;
|
||||
|
||||
obj = object_property_get_link(OBJECT(dev), "xive", &local_err);
|
||||
if (!obj) {
|
||||
error_propagate(errp, local_err);
|
||||
error_prepend(errp, "required link 'xive' not found: ");
|
||||
return;
|
||||
}
|
||||
|
||||
xsrc->xrtr = XIVE_ROUTER(obj);
|
||||
assert(xsrc->xrtr);
|
||||
|
||||
if (!xsrc->nr_ends) {
|
||||
error_setg(errp, "Number of interrupt needs to be greater than 0");
|
||||
|
@ -1850,6 +1841,8 @@ static Property xive_end_source_properties[] = {
|
|||
DEFINE_PROP_UINT8("block-id", XiveENDSource, block_id, 0),
|
||||
DEFINE_PROP_UINT32("nr-ends", XiveENDSource, nr_ends, 0),
|
||||
DEFINE_PROP_UINT32("shift", XiveENDSource, esb_shift, XIVE_ESB_64K),
|
||||
DEFINE_PROP_LINK("xive", XiveENDSource, xrtr, TYPE_XIVE_ROUTER,
|
||||
XiveRouter *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue