From: Thomas Huth <huth@tuxfamily.org>
To: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 08/10] hw/m68k/next-cube: Mirror BIOS to address 0
Date: Thu, 2 Nov 2023 11:05:41 +0100 [thread overview]
Message-ID: <20231102100543.4875-9-huth@tuxfamily.org> (raw)
In-Reply-To: <20231102100543.4875-1-huth@tuxfamily.org>
The ROM is also available at address 0, so add a proper mirror
for this address.
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20230930132351.30282-2-huth@tuxfamily.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
hw/m68k/next-cube.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index d17e6be8e1..2c94c6a9c2 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -945,6 +945,7 @@ static void next_cube_init(MachineState *machine)
M68kCPU *cpu;
CPUM68KState *env;
MemoryRegion *rom = g_new(MemoryRegion, 1);
+ MemoryRegion *rom2 = g_new(MemoryRegion, 1);
MemoryRegion *dmamem = g_new(MemoryRegion, 1);
MemoryRegion *bmapm1 = g_new(MemoryRegion, 1);
MemoryRegion *bmapm2 = g_new(MemoryRegion, 1);
@@ -993,9 +994,10 @@ static void next_cube_init(MachineState *machine)
sysbus_create_simple(TYPE_NEXTKBD, 0x0200e000, NULL);
/* Load ROM here */
- /* still not sure if the rom should also be mapped at 0x0*/
memory_region_init_rom(rom, NULL, "next.rom", 0x20000, &error_fatal);
memory_region_add_subregion(sysmem, 0x01000000, rom);
+ memory_region_init_alias(rom2, NULL, "next.rom2", rom, 0x0, 0x20000);
+ memory_region_add_subregion(sysmem, 0x0, rom2);
if (load_image_targphys(bios_name, 0x01000000, 0x20000) < 8) {
if (!qtest_enabled()) {
error_report("Failed to load firmware '%s'.", bios_name);
--
2.41.0
next prev parent reply other threads:[~2023-11-02 10:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 10:05 [PULL 00/10] m68k patches Thomas Huth
2023-11-02 10:05 ` [PULL 01/10] hw/m68k/irqc: Pass CPU using QOM link property Thomas Huth
2023-11-02 10:05 ` [PULL 02/10] hw/m68k/mcf5206: " Thomas Huth
2023-11-02 10:05 ` [PULL 03/10] hw/m68k/mcf_intc: Expose MMIO region via SysBus API Thomas Huth
2023-11-02 10:05 ` [PULL 04/10] hw/m68k/mcf_intc: Pass CPU using QOM link property Thomas Huth
2023-11-02 10:05 ` [PULL 05/10] hw/m68k/next-cube: Do not open-code sysbus_create_simple() Thomas Huth
2023-11-02 10:05 ` [PULL 06/10] hw/m68k/virt: " Thomas Huth
2023-11-02 10:05 ` [PULL 07/10] hw/char/mcf_uart: Have mcf_uart_create() return DeviceState Thomas Huth
2023-11-02 10:05 ` Thomas Huth [this message]
2023-11-02 10:05 ` [PULL 09/10] m68k: Instantiate the ESP SCSI controller for the NeXTcube machine Thomas Huth
2023-11-02 10:05 ` [PULL 10/10] tests/avocado/machine_m68k_nextcube: Fix the download URL for the ROM image Thomas Huth
2023-11-03 1:31 ` [PULL 00/10] m68k patches Stefan Hajnoczi
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=20231102100543.4875-9-huth@tuxfamily.org \
--to=huth@tuxfamily.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).