From: Dmitry Pimenov <[email protected]> blk_getlength() returns int64_t, but niagara_init() stored it in an int, truncating the if=pflash virtual-ramdisk size for images >= 2 GiB. A ~4 GiB image truncated to 0/negative, failed the `size > 0` check, and exit(1)'d before the CPU ran, ending with:
qemu-system-sparc64: could not load ram disk Signed-off-by: Dmitry Pimenov <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> (cherry picked from commit 76dbe26fd6500a94b85bf0f3a39d73b72f5fab7b) Signed-off-by: Michael Tokarev <[email protected]> diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 805ba6b1e3d..0a854681c4a 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -137,7 +137,7 @@ static void niagara_init(MachineState *machine) outside of the partition RAM */ if (dinfo) { BlockBackend *blk = blk_by_legacy_dinfo(dinfo); - int size = blk_getlength(blk); + int64_t size = blk_getlength(blk); if (size > 0) { memory_region_init_ram(&s->vdisk_ram, NULL, "sun4v_vdisk.ram", size, &error_fatal); -- 2.47.3
