[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 16/16] sd/milkymist-memcard: Fix error API violation
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v2 16/16] sd/milkymist-memcard: Fix error API violation |
Date: |
Mon, 22 Jun 2020 11:56:39 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
On 6/22/20 11:42 AM, Markus Armbruster wrote:
> The Error ** argument must be NULL, &error_abort, &error_fatal, or a
> pointer to a variable containing NULL. Passing an argument of the
> latter kind twice without clearing it in between is wrong: if the
> first call sets an error, it no longer points to NULL for the second
> call.
>
> milkymist_memcard_realize() is wrong that way: it passes &err to
> qdev_prop_set_drive_err() and qdev_realize_and_unref(). Currently
> harmless, because the latter uses it only as first argument of
> error_propagate().
>
> Making qdev_prop_set_drive_err() fail involves abuse of -global.
> Leave handling that to qdev_prop_set_drive(), like we do elsewhere.
>
> Cc: Michael Walle <michael@walle.cc>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> 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 1c23310715..482e97191e 100644
> --- a/hw/sd/milkymist-memcard.c
> +++ b/hw/sd/milkymist-memcard.c
> @@ -279,7 +279,7 @@ static void milkymist_memcard_realize(DeviceState *dev,
> Error **errp)
> dinfo = drive_get_next(IF_SD);
> blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL;
> carddev = qdev_new(TYPE_SD_CARD);
> - qdev_prop_set_drive_err(carddev, "drive", blk, &err);
> + 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));
>
- [PATCH v2 10/16] qdev: Improve netdev property override error a bit, (continued)
- [PATCH v2 10/16] qdev: Improve netdev property override error a bit, Markus Armbruster, 2020/06/22
- [PATCH v2 01/16] iotests/172: Include "info block" in test output, Markus Armbruster, 2020/06/22
- [PATCH v2 08/16] blockdev: Deprecate -drive with bogus interface type, Markus Armbruster, 2020/06/22
- [PATCH v2 09/16] qdev: Eliminate get_pointer(), set_pointer(), Markus Armbruster, 2020/06/22
- [PATCH v2 06/16] fdc: Deprecate configuring floppies with -global isa-fdc, Markus Armbruster, 2020/06/22
- [PATCH v2 04/16] fdc: Reject clash between -drive if=floppy and -global isa-fdc, Markus Armbruster, 2020/06/22
- [PATCH v2 13/16] qdev: Make qdev_prop_set_drive() match the other helpers, Markus Armbruster, 2020/06/22
- [PATCH v2 14/16] arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp, Markus Armbruster, 2020/06/22
- [PATCH v2 15/16] sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error, Markus Armbruster, 2020/06/22
- [PATCH v2 16/16] sd/milkymist-memcard: Fix error API violation, Markus Armbruster, 2020/06/22
- Re: [PATCH v2 16/16] sd/milkymist-memcard: Fix error API violation,
Philippe Mathieu-Daudé <=
- [PATCH v2 11/16] qdev: Reject drive property override, Markus Armbruster, 2020/06/22
- [PATCH v2 12/16] qdev: Reject chardev property override, Markus Armbruster, 2020/06/22
- Re: [PATCH v2 00/16] Crazy shit around -global (pardon my french), no-reply, 2020/06/22
- Re: [PATCH v2 00/16] Crazy shit around -global (pardon my french), John Snow, 2020/06/24