From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Jean-Christophe Dubois" <jcd@tribudubois.net>
Subject: [PULL 09/10] arm/sabrelite: Consistently use &error_fatal in sabrelite_init()
Date: Wed, 27 May 2020 07:59:44 +0200 [thread overview]
Message-ID: <20200527055945.6774-10-armbru@redhat.com> (raw)
In-Reply-To: <20200527055945.6774-1-armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200505101908.6207-10-armbru@redhat.com>
[Straightforward conflict with resolved d2623129a7 "qom: Drop
parameter @errp of object_property_add() & friends"]
---
hw/arm/sabrelite.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c
index 6f0e233d77..96cb30aa3c 100644
--- a/hw/arm/sabrelite.c
+++ b/hw/arm/sabrelite.c
@@ -41,7 +41,6 @@ static void sabrelite_reset_secondary(ARMCPU *cpu,
static void sabrelite_init(MachineState *machine)
{
FslIMX6State *s;
- Error *err = NULL;
/* Check the amount of memory is compatible with the SOC */
if (machine->ram_size > FSL_IMX6_MMDC_SIZE) {
@@ -52,11 +51,7 @@ static void sabrelite_init(MachineState *machine)
s = FSL_IMX6(object_new(TYPE_FSL_IMX6));
object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
- object_property_set_bool(OBJECT(s), true, "realized", &err);
- if (err != NULL) {
- error_report("%s", error_get_pretty(err));
- exit(1);
- }
+ object_property_set_bool(OBJECT(s), true, "realized", &error_fatal);
memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR,
machine->ram);
--
2.21.3
next prev parent reply other threads:[~2020-05-27 6:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 5:59 [PULL 00/10] Error reporting patches for 2020-05-27 Markus Armbruster
2020-05-27 5:59 ` [PULL 01/10] nvdimm: Plug memory leak in uuid property setter Markus Armbruster
2020-05-27 5:59 ` [PULL 02/10] xen: Fix and improve handling of device_add usb-host errors Markus Armbruster
2020-05-27 5:59 ` [PULL 03/10] s390x/cpumodel: Fix harmless misuse of visit_check_struct() Markus Armbruster
2020-05-27 5:59 ` [PULL 04/10] tests/migration: Tighten error checking Markus Armbruster
2020-05-27 5:59 ` [PULL 05/10] error: Use error_reportf_err() where appropriate Markus Armbruster
2020-05-27 5:59 ` [PULL 06/10] mips/malta: Fix create_cps() error handling Markus Armbruster
2020-05-27 5:59 ` [PULL 07/10] mips/boston: Fix boston_mach_init() " Markus Armbruster
2020-05-27 5:59 ` [PULL 08/10] mips/boston: Plug memory leak in boston_mach_init() Markus Armbruster
2020-05-27 5:59 ` Markus Armbruster [this message]
2020-05-27 5:59 ` [PULL 10/10] i386: Fix x86_cpu_load_model() error API violation Markus Armbruster
2020-05-28 11:08 ` [PULL 00/10] Error reporting patches for 2020-05-27 Peter Maydell
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=20200527055945.6774-10-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=f4bug@amsat.org \
--cc=jcd@tribudubois.net \
--cc=peter.maydell@linaro.org \
--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).