summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Armbruster2020-04-22 15:48:12 +0200
committerMarkus Armbruster2020-04-29 08:01:52 +0200
commitfc0cfc1decb5457058d7cbfeb7ae26ad5d6ecba4 (patch)
tree9fcb282e08a3d9b75f6a9402bce6bbfec58dcac6
parentqga: Fix qmp_guest_suspend_{disk, ram}() error handling (diff)
downloadqemu-fc0cfc1decb5457058d7cbfeb7ae26ad5d6ecba4.tar.gz
qemu-fc0cfc1decb5457058d7cbfeb7ae26ad5d6ecba4.tar.xz
qemu-fc0cfc1decb5457058d7cbfeb7ae26ad5d6ecba4.zip
sam460ex: Suppress useless warning on -m 32 and -m 64
Requesting 32 or 64 MiB of RAM with the sam460ex machine type produces a useless warning: qemu-system-ppc: warning: Memory size is too small for SDRAM type, adjusting type This is because sam460ex_init() asks spd_data_generate() for DDR2, which is impossible, so spd_data_generate() corrects it to DDR. The warning goes back to commit 08fd99179a "sam460ex: Clean up SPD EEPROM creation". Make sam460ex_init() pass the correct SDRAM type to get rid of the warning. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20200422134815.1584-2-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-rw-r--r--hw/ppc/sam460ex.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 898453cf30..1e3eaac0db 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -335,7 +335,8 @@ static void sam460ex_init(MachineState *machine)
dev = sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600700, uic[0][2]);
i2c = PPC4xx_I2C(dev)->bus;
/* SPD EEPROM on RAM module */
- spd_data = spd_data_generate(DDR2, ram_sizes[0], &err);
+ spd_data = spd_data_generate(ram_sizes[0] < 128 * MiB ? DDR : DDR2,
+ ram_sizes[0], &err);
if (err) {
warn_report_err(err);
}