[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/16] sd/milkymist-memcard: Fix error API violation
From: |
Markus Armbruster |
Subject: |
[PULL 16/16] sd/milkymist-memcard: Fix error API violation |
Date: |
Tue, 23 Jun 2020 16:23:26 +0200 |
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>
Message-Id: <20200622094227.1271650-17-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));
--
2.26.2
- [PULL 05/16] fdc: Open-code fdctrl_init_isa(), (continued)
- [PULL 05/16] fdc: Open-code fdctrl_init_isa(), Markus Armbruster, 2020/06/23
- [PULL 14/16] arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp, Markus Armbruster, 2020/06/23
- [PULL 10/16] qdev: Improve netdev property override error a bit, Markus Armbruster, 2020/06/23
- [PULL 08/16] blockdev: Deprecate -drive with bogus interface type, Markus Armbruster, 2020/06/23
- [PULL 02/16] iotests/172: Cover empty filename and multiple use of drives, Markus Armbruster, 2020/06/23
- [PULL 15/16] sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error, Markus Armbruster, 2020/06/23
- [PULL 04/16] fdc: Reject clash between -drive if=floppy and -global isa-fdc, Markus Armbruster, 2020/06/23
- [PULL 03/16] iotests/172: Cover -global floppy.drive=..., Markus Armbruster, 2020/06/23
- [PULL 11/16] qdev: Reject drive property override, Markus Armbruster, 2020/06/23
- [PULL 12/16] qdev: Reject chardev property override, Markus Armbruster, 2020/06/23
- [PULL 16/16] sd/milkymist-memcard: Fix error API violation,
Markus Armbruster <=
- [PULL 13/16] qdev: Make qdev_prop_set_drive() match the other helpers, Markus Armbruster, 2020/06/23
- [PULL 06/16] fdc: Deprecate configuring floppies with -global isa-fdc, Markus Armbruster, 2020/06/23
- Re: [PULL 00/16] Qdev patches for 2020-06-23, no-reply, 2020/06/23
- Re: [PULL 00/16] Qdev patches for 2020-06-23, Peter Maydell, 2020/06/25