* [PATCH for-5.1] sd/milkymist-memcard: Fix format string
@ 2020-07-22 20:40 Stefan Weil
2020-07-23 8:50 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stefan Weil @ 2020-07-22 20:40 UTC (permalink / raw)
To: qemu-devel, Michael Walle; +Cc: Stefan Weil
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);
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH for-5.1] sd/milkymist-memcard: Fix format string
2020-07-22 20:40 [PATCH for-5.1] sd/milkymist-memcard: Fix format string Stefan Weil
@ 2020-07-23 8:50 ` Philippe Mathieu-Daudé
2020-07-23 9:38 ` Markus Armbruster
2020-07-23 10:29 ` Li Qiang
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-23 8:50 UTC (permalink / raw)
To: Stefan Weil, qemu-devel, Michael Walle
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);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH for-5.1] sd/milkymist-memcard: Fix format string
2020-07-22 20:40 [PATCH for-5.1] sd/milkymist-memcard: Fix format string Stefan Weil
2020-07-23 8:50 ` Philippe Mathieu-Daudé
@ 2020-07-23 9:38 ` Markus Armbruster
2020-07-23 10:29 ` Li Qiang
2 siblings, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2020-07-23 9:38 UTC (permalink / raw)
To: Stefan Weil; +Cc: Michael Walle, qemu-devel
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH for-5.1] sd/milkymist-memcard: Fix format string
2020-07-22 20:40 [PATCH for-5.1] sd/milkymist-memcard: Fix format string Stefan Weil
2020-07-23 8:50 ` Philippe Mathieu-Daudé
2020-07-23 9:38 ` Markus Armbruster
@ 2020-07-23 10:29 ` Li Qiang
2 siblings, 0 replies; 4+ messages in thread
From: Li Qiang @ 2020-07-23 10:29 UTC (permalink / raw)
To: Stefan Weil; +Cc: Michael Walle, Qemu Developers
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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-23 10:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-22 20:40 [PATCH for-5.1] sd/milkymist-memcard: Fix format string Stefan Weil
2020-07-23 8:50 ` Philippe Mathieu-Daudé
2020-07-23 9:38 ` Markus Armbruster
2020-07-23 10:29 ` Li Qiang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.