[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/20] hw/core/loader.c: Improve reporting of ROM overlap errors
From: |
Peter Maydell |
Subject: |
[PULL 09/20] hw/core/loader.c: Improve reporting of ROM overlap errors |
Date: |
Tue, 15 Dec 2020 14:12:26 +0000 |
In rom_check_and_register_reset() we report to the user if there is
a "ROM region overlap". This has a couple of problems:
* the reported information is not very easy to intepret
* the function just prints the overlap to stderr (and relies on
its single callsite in vl.c to do an error_report() and exit)
* only the first overlap encountered is diagnosed
Make this function use error_report() and error_printf() and
report a more user-friendly report with all the overlaps
diagnosed.
Sample old output:
rom: requested regions overlap (rom dtb. free=0x0000000000008000,
addr=0x0000000000000000)
qemu-system-aarch64: rom check and register reset failed
Sample new output:
qemu-system-aarch64: Some ROM regions are overlapping
These ROM regions might have been loaded by direct user request or by default.
They could be BIOS/firmware images, a guest kernel, initrd or some other file
loaded into guest memory.
Check whether you intended to load all this guest code, and whether it has been
built to load to the correct addresses.
The following two regions overlap (in the cpu-memory-0 address space):
phdr #0: /home/petmay01/linaro/qemu-misc-tests/ldmia-fault.axf (addresses
0x0000000000000000 - 0x0000000000008000)
dtb (addresses 0x0000000000000000 - 0x0000000000100000)
The following two regions overlap (in the cpu-memory-0 address space):
phdr #1: /home/petmay01/linaro/qemu-misc-tests/bad-psci-call.axf (addresses
0x0000000040000000 - 0x0000000040000010)
phdr #0: /home/petmay01/linaro/qemu-misc-tests/bp-test.elf (addresses
0x0000000040000000 - 0x0000000040000020)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201129203923.10622-3-peter.maydell@linaro.org
---
hw/core/loader.c | 48 ++++++++++++++++++++++++++++++++++++++++++------
softmmu/vl.c | 1 -
2 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 45aaba6158b..9feca32de98 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -1176,10 +1176,42 @@ static bool roms_overlap(Rom *last_rom, Rom *this_rom)
last_rom->addr + last_rom->romsize > this_rom->addr;
}
+static const char *rom_as_name(Rom *rom)
+{
+ const char *name = rom->as ? rom->as->name : NULL;
+ return name ?: "anonymous";
+}
+
+static void rom_print_overlap_error_header(void)
+{
+ error_report("Some ROM regions are overlapping");
+ error_printf(
+ "These ROM regions might have been loaded by "
+ "direct user request or by default.\n"
+ "They could be BIOS/firmware images, a guest kernel, "
+ "initrd or some other file loaded into guest memory.\n"
+ "Check whether you intended to load all this guest code, and "
+ "whether it has been built to load to the correct addresses.\n");
+}
+
+static void rom_print_one_overlap_error(Rom *last_rom, Rom *rom)
+{
+ error_printf(
+ "\nThe following two regions overlap (in the %s address space):\n",
+ rom_as_name(rom));
+ error_printf(
+ " %s (addresses 0x" TARGET_FMT_plx " - 0x" TARGET_FMT_plx ")\n",
+ last_rom->name, last_rom->addr, last_rom->addr + last_rom->romsize);
+ error_printf(
+ " %s (addresses 0x" TARGET_FMT_plx " - 0x" TARGET_FMT_plx ")\n",
+ rom->name, rom->addr, rom->addr + rom->romsize);
+}
+
int rom_check_and_register_reset(void)
{
MemoryRegionSection section;
Rom *rom, *last_rom = NULL;
+ bool found_overlap = false;
QTAILQ_FOREACH(rom, &roms, next) {
if (rom->fw_file) {
@@ -1187,12 +1219,12 @@ int rom_check_and_register_reset(void)
}
if (!rom->mr) {
if (roms_overlap(last_rom, rom)) {
- fprintf(stderr, "rom: requested regions overlap "
- "(rom %s. free=0x" TARGET_FMT_plx
- ", addr=0x" TARGET_FMT_plx ")\n",
- rom->name, last_rom->addr + last_rom->romsize,
- rom->addr);
- return -1;
+ if (!found_overlap) {
+ found_overlap = true;
+ rom_print_overlap_error_header();
+ }
+ rom_print_one_overlap_error(last_rom, rom);
+ /* Keep going through the list so we report all overlaps */
}
last_rom = rom;
}
@@ -1201,6 +1233,10 @@ int rom_check_and_register_reset(void)
rom->isrom = int128_nz(section.size) &&
memory_region_is_rom(section.mr);
memory_region_unref(section.mr);
}
+ if (found_overlap) {
+ return -1;
+ }
+
qemu_register_reset(rom_reset, NULL);
roms_loaded = 1;
return 0;
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 7146fbe2198..cbf3896ce66 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3278,7 +3278,6 @@ static void qemu_machine_creation_done(void)
qemu_run_machine_init_done_notifiers();
if (rom_check_and_register_reset() != 0) {
- error_report("rom check and register reset failed");
exit(1);
}
--
2.20.1
- [PULL 00/20] target-arm queue, Peter Maydell, 2020/12/15
- [PULL 04/20] target/openrisc: Move pic_cpu code into CPU object proper, Peter Maydell, 2020/12/15
- [PULL 05/20] target/nios2: Move IIC code into CPU object proper, Peter Maydell, 2020/12/15
- [PULL 02/20] hw/openrisc/openrisc_sim: Use IRQ splitter when connecting IRQ to multiple CPUs, Peter Maydell, 2020/12/15
- [PULL 03/20] hw/openrisc/openrisc_sim: Abstract out "get IRQ x of CPU y", Peter Maydell, 2020/12/15
- [PULL 07/20] target/nios2: Use deposit32() to update ipending register, Peter Maydell, 2020/12/15
- [PULL 10/20] elf_ops.h: Don't truncate name of the ROM blobs we create, Peter Maydell, 2020/12/15
- [PULL 09/20] hw/core/loader.c: Improve reporting of ROM overlap errors,
Peter Maydell <=
- [PULL 06/20] target/nios2: Move nios2_check_interrupts() into target/nios2, Peter Maydell, 2020/12/15
- [PULL 11/20] elf_ops.h: Be more verbose with ROM blob names, Peter Maydell, 2020/12/15
- [PULL 01/20] gdbstub: Correct misparsing of vCont C/S requests, Peter Maydell, 2020/12/15
- [PULL 15/20] arm: xlnx-versal: Connect usb to virt-versal, Peter Maydell, 2020/12/15
- [PULL 14/20] usb: xlnx-usb-subsystem: Add xilinx usb subsystem, Peter Maydell, 2020/12/15
- [PULL 13/20] usb: Add DWC3 model, Peter Maydell, 2020/12/15
- [PULL 16/20] hw/misc/zynq_slcr: Avoid #DIV/0! error, Peter Maydell, 2020/12/15
- [PULL 17/20] hw/block/m25p80: Make Numonyx config field names more accurate, Peter Maydell, 2020/12/15
- [PULL 08/20] hw/core/loader.c: Track last-seen ROM in rom_check_and_register_reset(), Peter Maydell, 2020/12/15
- [PULL 12/20] usb: Add versal-usb2-ctrl-regs module, Peter Maydell, 2020/12/15