Patch created mechanically by running: $ spatch \ --macro-file scripts/cocci-macro-file.h --include-headers \ --sp-file scripts/coccinelle/use-error_propagate-in-realize.cocci \ --keep-comments --smpl-spacing --in-place --dir hw
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- hw/pci-host/pnv_phb3.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c index 57d717ed23..a9029f5a02 100644 --- a/hw/pci-host/pnv_phb3.c +++ b/hw/pci-host/pnv_phb3.c @@ -1008,7 +1008,11 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) /* LSI sources */ object_property_set_link(OBJECT(&phb->lsis), OBJECT(pnv), "xics", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_bool(OBJECT(&phb->lsis), true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err); @@ -1023,9 +1027,17 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) /* MSI sources */ object_property_set_link(OBJECT(&phb->msis), OBJECT(phb), "phb", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_link(OBJECT(&phb->msis), OBJECT(pnv), "xics", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_bool(OBJECT(&phb->msis), true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err); @@ -1034,7 +1046,11 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) /* Power Bus Common Queue */ object_property_set_link(OBJECT(&phb->pbcq), OBJECT(phb), "phb", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_bool(OBJECT(&phb->pbcq), true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err); -- 2.21.1