[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v3 08/11] hw/hppa/machine: Correctly check the firmware is in PDC
From: |
Richard Henderson |
Subject: |
[PULL v3 08/11] hw/hppa/machine: Correctly check the firmware is in PDC range |
Date: |
Fri, 24 Jan 2020 13:20:06 -1000 |
From: Philippe Mathieu-Daudé <address@hidden>
The firmware has to reside in the PDC range. If the Elf file
expects to load it below FIRMWARE_START, it is incorrect,
regardless the RAM size.
Acked-by: Helge Deller <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
hw/hppa/machine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index a35527cfc7..e57530950a 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -171,7 +171,7 @@ static void machine_hppa_init(MachineState *machine)
qemu_log_mask(CPU_LOG_PAGE, "Firmware loaded at 0x%08" PRIx64
"-0x%08" PRIx64 ", entry at 0x%08" PRIx64 ".\n",
firmware_low, firmware_high, firmware_entry);
- if (firmware_low < ram_size || firmware_high >= FIRMWARE_END) {
+ if (firmware_low < FIRMWARE_START || firmware_high >= FIRMWARE_END) {
error_report("Firmware overlaps with memory or IO space");
exit(1);
}
--
2.20.1
- [PULL v3 00/11] target/hppa patch queue, Richard Henderson, 2020/01/24
- [PULL v3 01/11] hw/hppa/dino.c: Improve emulation of Dino PCI chip, Richard Henderson, 2020/01/24
- [PULL v3 03/11] ps2: accept 'Set Key Make and Break' commands, Richard Henderson, 2020/01/24
- [PULL v3 05/11] hppa: Switch to tulip NIC by default, Richard Henderson, 2020/01/24
- [PULL v3 04/11] hppa: add emulation of LASI PS2 controllers, Richard Henderson, 2020/01/24
- [PULL v3 02/11] hppa: Add support for LASI chip with i82596 NIC, Richard Henderson, 2020/01/24
- [PULL v3 08/11] hw/hppa/machine: Correctly check the firmware is in PDC range,
Richard Henderson <=
- [PULL v3 09/11] hw/hppa/machine: Restrict the total memory size to 3GB, Richard Henderson, 2020/01/24
- [PULL v3 10/11] hw/hppa/machine: Map the PDC memory region with higher priority, Richard Henderson, 2020/01/24
- [PULL v3 07/11] hppa: Add emulation of Artist graphics, Richard Henderson, 2020/01/24
- [PULL v3 11/11] target/hppa: Allow, but diagnose, LDCW aligned only mod 4, Richard Henderson, 2020/01/24
- [PULL v3 06/11] seabios-hppa: update to latest version, Richard Henderson, 2020/01/24
- Re: [PULL v3 00/11] target/hppa patch queue, Peter Maydell, 2020/01/27