diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2020-02-19 11:09:39 -0500 |
|---|---|---|
| committer | Patchew Importer <importer@patchew.org> | 2020-02-19 16:50:00 +0000 |
| commit | a0258e4afa10a8e9dba4901b7a8202dac24c72e2 (patch) | |
| tree | a46aa725643ed83e639f148a0e3fc3eeaa22029c /include | |
| parent | 2dc9ce13d210d591a0b9d98234fe6f39a535bf68 (diff) | |
| download | qemu-a0258e4afa10a8e9dba4901b7a8202dac24c72e2.zip qemu-a0258e4afa10a8e9dba4901b7a8202dac24c72e2.tar.gz qemu-a0258e4afa10a8e9dba4901b7a8202dac24c72e2.tar.bz2 | |
ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup
If user provided non-sense RAM size, board will complain and
continue running with max RAM size supported or sometimes
crash like this:
%QEMU -M bamboo -m 1
exec.c:1926: find_ram_offset: Assertion `size != 0' failed.
Aborted (core dumped)
Also RAM is going to be allocated by generic code, so it won't be
possible for board to fix things up for user.
Make it error message and exit to force user fix CLI,
instead of accepting non-sense CLI values.
That also fixes crash issue, since wrongly calculated size
isn't used to allocate RAM
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20200219160953.13771-66-imammedo@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/ppc/ppc4xx.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h index 7d82259..b8c8f32 100644 --- a/include/hw/ppc/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h @@ -42,11 +42,10 @@ enum { qemu_irq *ppcuic_init (CPUPPCState *env, qemu_irq *irqs, uint32_t dcr_base, int has_ssr, int has_vr); -ram_addr_t ppc4xx_sdram_adjust(ram_addr_t ram_size, int nr_banks, - MemoryRegion ram_memories[], - hwaddr ram_bases[], - hwaddr ram_sizes[], - const ram_addr_t sdram_bank_sizes[]); +void ppc4xx_sdram_banks(ram_addr_t ram_size, int nr_banks, + MemoryRegion ram_memories[], + hwaddr ram_bases[], hwaddr ram_sizes[], + const ram_addr_t sdram_bank_sizes[]); void ppc4xx_sdram_init (CPUPPCState *env, qemu_irq irq, int nbanks, MemoryRegion ram_memories[], |