On 6/30/20 11:03 AM, Markus Armbruster wrote: > milkymist_memcard_realize() leaks an Error object when realization of > its "sd-card" device fails. Quite harmless, since we only ever > realize this once, in milkymist_init() via milkymist_memcard_create(). > > Plug the leak. > > Fixes: 3d0369ba499866cc6a839f71212d97876500762d > Cc: Philippe Mathieu-Daudé <phi...@redhat.com> > Cc: Michael Walle <mich...@walle.cc> > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > hw/sd/milkymist-memcard.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c > index 482e97191e..afdb8aa0c0 100644 > --- a/hw/sd/milkymist-memcard.c > +++ b/hw/sd/milkymist-memcard.c > @@ -280,9 +280,8 @@ static void milkymist_memcard_realize(DeviceState *dev, > Error **errp) > blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; > carddev = qdev_new(TYPE_SD_CARD); > qdev_prop_set_drive(carddev, "drive", blk); > - qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err); > - if (err) { > - error_setg(errp, "failed to init SD card: %s", > error_get_pretty(err)); > + if (!qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err)) { > + error_propagate_prepend(errp, err, "failed to init SD card: %s"); > return; > } > s->enabled = blk && blk_is_inserted(blk); >
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>