[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/28] sd/milkymist-memcard: Plug minor memory leak in realize
From: |
Markus Armbruster |
Subject: |
[PULL 11/28] sd/milkymist-memcard: Plug minor memory leak in realize |
Date: |
Thu, 2 Jul 2020 13:09:14 +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>
Message-Id: <20200630090351.1247703-10-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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
- [PULL 06/28] tests: Use &error_abort where appropriate, (continued)
- [PULL 06/28] tests: Use &error_abort where appropriate, Markus Armbruster, 2020/07/02
- [PULL 12/28] test-util-filemonitor: Plug unlikely memory leak, Markus Armbruster, 2020/07/02
- [PULL 07/28] tests: Use error_free_or_abort() where appropriate, Markus Armbruster, 2020/07/02
- [PULL 02/28] hw/virtio/virtio-iommu-pci.c: Fix typo in error message, Markus Armbruster, 2020/07/02
- [PULL 15/28] qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp, Markus Armbruster, 2020/07/02
- [PULL 14/28] aspeed: Clean up roundabout error propagation, Markus Armbruster, 2020/07/02
- [PULL 20/28] riscv_hart: Fix riscv_harts_realize() error API violations, Markus Armbruster, 2020/07/02
- [PULL 08/28] usb/dev-mtp: Fix Error double free after inotify failure, Markus Armbruster, 2020/07/02
- [PULL 22/28] x86: Fix x86_cpu_new() error handling, Markus Armbruster, 2020/07/02
- [PULL 10/28] qga: Plug unlikely memory leak in guest-set-memory-blocks, Markus Armbruster, 2020/07/02
- [PULL 11/28] sd/milkymist-memcard: Plug minor memory leak in realize,
Markus Armbruster <=
- [PULL 13/28] vnc: Plug minor memory leak in vnc_display_open(), Markus Armbruster, 2020/07/02
- [PULL 16/28] qdev: Drop qbus_set_hotplug_handler() parameter @errp, Markus Armbruster, 2020/07/02
- [PULL 28/28] migration/rdma: Plug memory leaks in qemu_rdma_registration_stop(), Markus Armbruster, 2020/07/02
- [PULL 19/28] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations, Markus Armbruster, 2020/07/02
- [PULL 03/28] net/virtio: Fix failover_replug_primary() return value regression, Markus Armbruster, 2020/07/02
- [PULL 04/28] pci: Delete useless error_propagate(), Markus Armbruster, 2020/07/02
- [PULL 23/28] amd_iommu: Fix amdvi_realize() error API violation, Markus Armbruster, 2020/07/02
- [PULL 05/28] Clean up some calls to ignore Error objects the right way, Markus Armbruster, 2020/07/02
- [PULL 24/28] arm/stm32f205 arm/stm32f405: Fix realize error API violation, Markus Armbruster, 2020/07/02
- [PULL 25/28] aspeed: Fix realize error API violation, Markus Armbruster, 2020/07/02