From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael Walle" <michael@walle.cc>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 09/25] sd/milkymist-memcard: Plug minor memory leak in realize
Date: Wed, 24 Jun 2020 10:37:21 +0200 [thread overview]
Message-ID: <20200624083737.3086768-10-armbru@redhat.com> (raw)
In-Reply-To: <20200624083737.3086768-1-armbru@redhat.com>
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
next prev parent reply other threads:[~2020-06-24 8:44 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 8:37 [PATCH v2 00/25] Error handling fixes & cleanups Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 01/25] net/virtio: Fix failover_replug_primary() return value regression Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 02/25] pci: Delete useless error_propagate() Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 03/25] Clean up some calls to ignore Error objects the right way Markus Armbruster
2020-06-24 9:02 ` Greg Kurz
2020-06-25 6:42 ` Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 04/25] tests: Use &error_abort where appropriate Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 05/25] tests: Use error_free_or_abort() " Markus Armbruster
2020-06-24 14:42 ` Eric Blake
2020-06-24 8:37 ` [PATCH v2 06/25] usb/dev-mtp: Fix Error double free after inotify failure Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 07/25] spapr: Plug minor memory leak in spapr_machine_init() Markus Armbruster
2020-06-24 9:04 ` Greg Kurz
2020-06-25 3:52 ` David Gibson
2020-06-24 8:37 ` [PATCH v2 08/25] qga: Plug unlikely memory leak in guest-set-memory-blocks Markus Armbruster
2020-06-24 8:37 ` Markus Armbruster [this message]
2020-06-24 8:37 ` [PATCH v2 10/25] test-util-filemonitor: Plug unlikely memory leak Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 11/25] vnc: Plug minor memory leak in vnc_display_open() Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 12/25] aspeed: Clean up roundabout error propagation Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 13/25] qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 14/25] qdev: Drop qbus_set_hotplug_handler() " Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 15/25] hw: Fix error API violation around object_property_set_link() Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 16/25] hw/arm: Drop useless object_property_set_link() error handling Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 17/25] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 18/25] riscv_hart: Fix riscv_harts_realize() " Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 19/25] mips/cps: Fix mips_cps_realize() " Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 20/25] x86: Fix x86_cpu_new() " Markus Armbruster
2020-06-24 14:17 ` Igor Mammedov
2020-06-24 14:20 ` Paolo Bonzini
2020-06-25 6:44 ` Markus Armbruster
2020-06-25 19:29 ` Igor Mammedov
2020-06-26 12:54 ` Markus Armbruster
2020-07-13 15:50 ` Igor Mammedov
2020-07-14 9:49 ` Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 21/25] amd_iommu: Fix amdvi_realize() error API violation Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 22/25] arm/stm32f205 arm/stm32f405: Fix realize " Markus Armbruster
2020-06-24 19:17 ` Alistair Francis
2020-06-24 8:37 ` [PATCH v2 23/25] aspeed: " Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 24/25] hw/arm/armsse: Fix armsse_realize() " Markus Armbruster
2020-06-24 8:37 ` [PATCH v2 25/25] arm/{bcm2835, fsl-imx25, fsl-imx6}: Fix realize error API violations Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200624083737.3086768-10-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=michael@walle.cc \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).