From: Philippe Mathieu-Daudé Date: Sat, 8 Feb 2020 16:56:42 +0000 (+0100) Subject: hw/arm/raspi: Set default RAM size to size encoded in board revision X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=975f3402fad40dc2e530e2a7a91ba7d0c2cd6a1d;p=qemu.git hw/arm/raspi: Set default RAM size to size encoded in board revision We added a helper to extract the RAM size from the board revision, and made board_rev a field of RaspiMachineClass. The class_init() can now use the helper to extract from the board revision the board-specific amount of RAM. Signed-off-by: Philippe Mathieu-Daudé Message-id: 20200208165645.15657-11-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 1628b0dda7..f0dcffbc2e 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -296,7 +296,7 @@ static void raspi2_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = BCM283X_NCPUS; mc->min_cpus = BCM283X_NCPUS; mc->default_cpus = BCM283X_NCPUS; - mc->default_ram_size = 1 * GiB; + mc->default_ram_size = board_ram_size(board_rev); mc->ignore_memory_transaction_failures = true; }; @@ -317,7 +317,7 @@ static void raspi3_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = BCM283X_NCPUS; mc->min_cpus = BCM283X_NCPUS; mc->default_cpus = BCM283X_NCPUS; - mc->default_ram_size = 1 * GiB; + mc->default_ram_size = board_ram_size(board_rev); } #endif