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 01/13] hw/arm/pxa2xx: Simplify pxa255_init()
Date: Mon, 9 Jan 2023 12:53:04 +0100 [thread overview]
Message-ID: <20230109115316.2235-2-philmd@linaro.org> (raw)
In-Reply-To: <20230109115316.2235-1-philmd@linaro.org>
Since pxa255_init() must map the device in the system memory,
there is no point in passing get_system_memory() by argument.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/gumstix.c | 3 +--
hw/arm/pxa2xx.c | 4 +++-
hw/arm/tosa.c | 2 +-
include/hw/arm/pxa.h | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 3a4bc332c4..c167518a46 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -51,12 +51,11 @@ static void connex_init(MachineState *machine)
{
PXA2xxState *cpu;
DriveInfo *dinfo;
- MemoryRegion *address_space_mem = get_system_memory();
uint32_t connex_rom = 0x01000000;
uint32_t connex_ram = 0x04000000;
- cpu = pxa255_init(address_space_mem, connex_ram);
+ cpu = pxa255_init(connex_ram);
dinfo = drive_get(IF_PFLASH, 0, 0);
if (!dinfo && !qtest_enabled()) {
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 93dda83d7a..8b8845fc63 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -11,6 +11,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
+#include "exec/address-spaces.h"
#include "cpu.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
@@ -2230,8 +2231,9 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
}
/* Initialise a PXA255 integrated chip (ARM based core). */
-PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
+PXA2xxState *pxa255_init(unsigned int sdram_size)
{
+ MemoryRegion *address_space = get_system_memory();
PXA2xxState *s;
int i;
DriveInfo *dinfo;
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index d5a6763cf9..3ca2e4459c 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -242,7 +242,7 @@ static void tosa_init(MachineState *machine)
TC6393xbState *tmio;
DeviceState *scp0, *scp1;
- mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
+ mpu = pxa255_init(tosa_binfo.ram_size);
memory_region_init_rom(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal);
memory_region_add_subregion(address_space_mem, 0, rom);
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index 1095504b86..c26007e57f 100644
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -195,6 +195,6 @@ struct PXA2xxI2SState {
PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size,
const char *revision);
-PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size);
+PXA2xxState *pxa255_init(unsigned int sdram_size);
#endif /* PXA_H */
--
2.38.1
next prev parent reply other threads:[~2023-01-09 12:04 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 ` Philippe Mathieu-Daudé [this message]
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 ` [PATCH 12/13] hw/arm/vexpress: Remove dead code in vexpress_common_init() Philippe Mathieu-Daudé
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-2-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).