[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/22] sd/milkymist-memcard: Plug minor memory leak in realize
From: |
Markus Armbruster |
Subject: |
[PATCH 09/22] sd/milkymist-memcard: Plug minor memory leak in realize |
Date: |
Mon, 22 Jun 2020 12:42:37 +0200 |
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é <philmd@redhat.com>
Cc: Michael Walle <michael@walle.cc>
Signed-off-by: Markus Armbruster <armbru@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);
--
2.26.2
- [PATCH 00/22] Error handling fixes & cleanups, Markus Armbruster, 2020/06/22
- [PATCH 09/22] sd/milkymist-memcard: Plug minor memory leak in realize,
Markus Armbruster <=
- [PATCH 04/22] tests: Use &error_abort where appropriate, Markus Armbruster, 2020/06/22
- [PATCH 10/22] test-util-filemonitor: Plug unlikely memory leak, Markus Armbruster, 2020/06/22
- [PATCH 03/22] Clean up some calls to ignore Error objects the right way, Markus Armbruster, 2020/06/22
- [PATCH 14/22] qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp, Markus Armbruster, 2020/06/22
- [PATCH 05/22] tests: Use error_free_or_abort() where appropriate, Markus Armbruster, 2020/06/22
- [PATCH 08/22] qga: Plug unlikely memory leak in guest-set-memory-blocks, Markus Armbruster, 2020/06/22
- [PATCH 15/22] qdev: Drop qbus_set_hotplug_handler() parameter @errp, Markus Armbruster, 2020/06/22