| Message ID | 20200722204054.1400555-1-sw@weilnetz.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for-5.1] sd/milkymist-memcard: Fix format string | expand |
On 7/22/20 10:40 PM, Stefan Weil wrote:
Fixes: b98e8d1230 ("sd/milkymist-memcard: Plug minor memory leak in
realize")
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> hw/sd/milkymist-memcard.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
> index afdb8aa0c0..11f61294fc 100644
> --- a/hw/sd/milkymist-memcard.c
> +++ b/hw/sd/milkymist-memcard.c
> @@ -281,7 +281,7 @@ static void milkymist_memcard_realize(DeviceState *dev, Error **errp)
> carddev = qdev_new(TYPE_SD_CARD);
> qdev_prop_set_drive(carddev, "drive", blk);
> if (!qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err)) {
> - error_propagate_prepend(errp, err, "failed to init SD card: %s");
> + error_propagate_prepend(errp, err, "failed to init SD card");
Oops... b98e8d1230 was to fix 3d0369ba49 ("hw/sd/milkymist-memcard:
expose a SDBus and connect the SDCard to it").
> return;
> }
> s->enabled = blk && blk_is_inserted(blk);
>
Stefan Weil <sw@weilnetz.de> writes: Let's add Fixes: b98e8d1230ff7023bb34ddeb7194424dfcbaf789 > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > hw/sd/milkymist-memcard.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c > index afdb8aa0c0..11f61294fc 100644 > --- a/hw/sd/milkymist-memcard.c > +++ b/hw/sd/milkymist-memcard.c > @@ -281,7 +281,7 @@ static void milkymist_memcard_realize(DeviceState *dev, Error **errp) > carddev = qdev_new(TYPE_SD_CARD); > qdev_prop_set_drive(carddev, "drive", blk); > if (!qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err)) { > - error_propagate_prepend(errp, err, "failed to init SD card: %s"); > + error_propagate_prepend(errp, err, "failed to init SD card"); > return; > } > s->enabled = blk && blk_is_inserted(blk); Reviewed-by: Markus Armbruster <armbru@redhat.com> Missed because error_propagate_prepend() lacks GCC_FMT_ATTR(). I'll fix that. Since the fix needs to be on top of this patch, me taking both patches through my tree would be easier for me, assuming Michael doesn't mind. Thanks for the fix, Stefan!
Stefan Weil <sw@weilnetz.de> 于2020年7月23日周四 上午4:41写道： > > Signed-off-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/sd/milkymist-memcard.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c > index afdb8aa0c0..11f61294fc 100644 > --- a/hw/sd/milkymist-memcard.c > +++ b/hw/sd/milkymist-memcard.c > @@ -281,7 +281,7 @@ static void milkymist_memcard_realize(DeviceState *dev, Error **errp) > carddev = qdev_new(TYPE_SD_CARD); > qdev_prop_set_drive(carddev, "drive", blk); > if (!qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err)) { > - error_propagate_prepend(errp, err, "failed to init SD card: %s"); > + error_propagate_prepend(errp, err, "failed to init SD card"); > return; > } > s->enabled = blk && blk_is_inserted(blk); > -- > 2.27.0 > >
diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index afdb8aa0c0..11f61294fc 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -281,7 +281,7 @@ static void milkymist_memcard_realize(DeviceState *dev, Error **errp) carddev = qdev_new(TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk); if (!qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err)) { - error_propagate_prepend(errp, err, "failed to init SD card: %s"); + error_propagate_prepend(errp, err, "failed to init SD card"); return; } s->enabled = blk && blk_is_inserted(blk);
Signed-off-by: Stefan Weil <sw@weilnetz.de> --- hw/sd/milkymist-memcard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)