From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, "Jan Kiszka" <jan.kiszka@web.de>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 12/13] hw/arm/vexpress: Remove dead code in vexpress_common_init()
Date: Mon, 9 Jan 2023 12:53:15 +0100 [thread overview]
Message-ID: <20230109115316.2235-13-philmd@linaro.org> (raw)
In-Reply-To: <20230109115316.2235-1-philmd@linaro.org>
Upon introduction in commit b8433303fb ("Set proper device-width
for vexpress flash"), ve_pflash_cfi01_register() was calling
qdev_init_nofail() which can not fail. This call was later
converted with a script to use &error_fatal, still unable to
fail. Remove the unreachable code.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/vexpress.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index e1d1983ae6..757236767b 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -659,10 +659,6 @@ static void vexpress_common_init(MachineState *machine)
dinfo = drive_get(IF_PFLASH, 0, 0);
pflash0 = ve_pflash_cfi01_register(map[VE_NORFLASH0], "vexpress.flash0",
dinfo);
- if (!pflash0) {
- error_report("vexpress: error registering flash 0");
- exit(1);
- }
if (map[VE_NORFLASHALIAS] != -1) {
/* Map flash 0 as an alias into low memory */
@@ -673,11 +669,7 @@ static void vexpress_common_init(MachineState *machine)
}
dinfo = drive_get(IF_PFLASH, 0, 1);
- if (!ve_pflash_cfi01_register(map[VE_NORFLASH1], "vexpress.flash1",
- dinfo)) {
- error_report("vexpress: error registering flash 1");
- exit(1);
- }
+ ve_pflash_cfi01_register(map[VE_NORFLASH1], "vexpress.flash1", dinfo);
sram_size = 0x2000000;
memory_region_init_ram(sram, NULL, "vexpress.sram", sram_size,
--
2.38.1
next prev parent reply other threads:[~2023-01-09 12:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 11:53 [PATCH 00/13] hw/arm: Cleanups before pflash refactor Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 01/13] hw/arm/pxa2xx: Simplify pxa255_init() Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 02/13] hw/arm/pxa2xx: Simplify pxa270_init() Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 03/13] hw/arm/collie: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 04/13] hw/arm/collie: Simplify flash creation using for() loop Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 05/13] hw/arm/gumstix: Improve documentation Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 06/13] hw/arm/gumstix: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 07/13] hw/arm/mainstone: " Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 08/13] hw/arm/musicpal: " Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 09/13] hw/arm/omap_sx1: Remove unused 'total_ram' definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 10/13] hw/arm/omap_sx1: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 11/13] hw/arm/z2: " Philippe Mathieu-Daudé
2023-01-09 11:53 ` Philippe Mathieu-Daudé [this message]
2023-01-09 11:53 ` [PATCH 13/13] hw/arm: Remove unreachable code calling pflash_cfi01_register() Philippe Mathieu-Daudé
2023-01-09 17:40 ` [PATCH 00/13] hw/arm: Cleanups before pflash refactor Richard Henderson
2023-01-12 17:04 ` 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=20230109115316.2235-13-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=jan.kiszka@web.de \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.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).