| Message ID | 150516748034.6883.2205624415045931101.stgit@bahia.lan (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 12, 2017 at 12:04:40AM +0200, Greg Kurz wrote: > If object_property_get_link() fails then it allocates an error, which > must be freed before returning. The error_get_pretty() function is > merely an accessor to the error message and doesn't free anything. > > The error.h header indicates how to do it right: > > * Pass an existing error to the caller with the message modified: > * error_propagate(errp, err); > * error_prepend(errp, "Could not frobnicate '%s': ", name); > > Signed-off-by: Greg Kurz <groug@kaod.org> Applied to ppc-for-2.11. > --- > hw/intc/xics.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index a84ba51ad8ff..80c33be02e5e 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -306,8 +306,8 @@ static void icp_realize(DeviceState *dev, Error **errp) > > obj = object_property_get_link(OBJECT(dev), ICP_PROP_XICS, &err); > if (!obj) { > - error_setg(errp, "%s: required link '" ICP_PROP_XICS "' not found: %s", > - __func__, error_get_pretty(err)); > + error_propagate(errp, err); > + error_prepend(errp, "required link '" ICP_PROP_XICS "' not found: "); > return; > } > > @@ -315,8 +315,8 @@ static void icp_realize(DeviceState *dev, Error **errp) > > obj = object_property_get_link(OBJECT(dev), ICP_PROP_CPU, &err); > if (!obj) { > - error_setg(errp, "%s: required link '" ICP_PROP_CPU "' not found: %s", > - __func__, error_get_pretty(err)); > + error_propagate(errp, err); > + error_prepend(errp, "required link '" ICP_PROP_CPU "' not found: "); > return; > } > > @@ -641,8 +641,8 @@ static void ics_base_realize(DeviceState *dev, Error **errp) > > obj = object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &err); > if (!obj) { > - error_setg(errp, "%s: required link '" ICS_PROP_XICS "' not found: %s", > - __func__, error_get_pretty(err)); > + error_propagate(errp, err); > + error_prepend(errp, "required link '" ICS_PROP_XICS "' not found: "); > return; > } > ics->xics = XICS_FABRIC(obj); >
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index a84ba51ad8ff..80c33be02e5e 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -306,8 +306,8 @@ static void icp_realize(DeviceState *dev, Error **errp) obj = object_property_get_link(OBJECT(dev), ICP_PROP_XICS, &err); if (!obj) { - error_setg(errp, "%s: required link '" ICP_PROP_XICS "' not found: %s", - __func__, error_get_pretty(err)); + error_propagate(errp, err); + error_prepend(errp, "required link '" ICP_PROP_XICS "' not found: "); return; } @@ -315,8 +315,8 @@ static void icp_realize(DeviceState *dev, Error **errp) obj = object_property_get_link(OBJECT(dev), ICP_PROP_CPU, &err); if (!obj) { - error_setg(errp, "%s: required link '" ICP_PROP_CPU "' not found: %s", - __func__, error_get_pretty(err)); + error_propagate(errp, err); + error_prepend(errp, "required link '" ICP_PROP_CPU "' not found: "); return; } @@ -641,8 +641,8 @@ static void ics_base_realize(DeviceState *dev, Error **errp) obj = object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &err); if (!obj) { - error_setg(errp, "%s: required link '" ICS_PROP_XICS "' not found: %s", - __func__, error_get_pretty(err)); + error_propagate(errp, err); + error_prepend(errp, "required link '" ICS_PROP_XICS "' not found: "); return; } ics->xics = XICS_FABRIC(obj);
If object_property_get_link() fails then it allocates an error, which must be freed before returning. The error_get_pretty() function is merely an accessor to the error message and doesn't free anything. The error.h header indicates how to do it right: * Pass an existing error to the caller with the message modified: * error_propagate(errp, err); * error_prepend(errp, "Could not frobnicate '%s': ", name); Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/intc/xics.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)