This is in line with the PA-8700 specification which demands 44 bits. However, this change breaks the SeaBIOS functional tests as the firmware assumes 40 bit physical addresses. Therefore, change the functional tests to instead run on an A400 which has the expected physical address space size.
Reviewed-by: Helge Deller <[email protected]> Signed-off-by: Anton Johansson <[email protected]> --- target/hppa/cpu.c | 2 +- tests/functional/hppa/test_seabios.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index b04bcfa6a0..bf54aac96c 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -351,7 +351,7 @@ static const TypeInfo hppa_cpu_type_infos[] = { .name = TYPE_HPPA_CPU_PA_8700, .parent = TYPE_HPPA_CPU, .class_data = &(const HPPACPUDef) { - .phys_addr_bits = 40, + .phys_addr_bits = 44, .is_pa20 = true, }, }, diff --git a/tests/functional/hppa/test_seabios.py b/tests/functional/hppa/test_seabios.py index 661b2464e1..bdb9d534ef 100755 --- a/tests/functional/hppa/test_seabios.py +++ b/tests/functional/hppa/test_seabios.py @@ -12,7 +12,7 @@ class HppaSeabios(QemuSystemTest): timeout = 5 - MACH_BITS = {'B160L': 32, 'C3700': 64} + MACH_BITS = {'B160L': 32, 'A400': 64} def boot_seabios(self): mach = self.machine @@ -28,7 +28,7 @@ def test_hppa_32(self): self.boot_seabios() def test_hppa_64(self): - self.set_machine('C3700') + self.set_machine('A400') self.boot_seabios() if __name__ == '__main__': -- 2.52.0
