Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 10:25:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/ppc/ppc405_boards: Don't use load_image()

Browse Source 
The load_image() function is deprecated, as it does not let the
caller specify how large the buffer to read the file into is.
Instead use load_image_size().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Message-id: 20181130151712.2312-3-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-12-14 13:30:50 +00:00
parent 9776874f03
commit 214b63cd93
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/ppc/ppc405_boards.c
View File

@ -219,9 +219,11 @@ static void ref405ep_init(MachineState *machine)
bios_name = BIOS_FILENAME; bios_name = BIOS_FILENAME;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) { if (filename) {
bios_size = load_image(filename, memory_region_get_ram_ptr(bios)); bios_size = load_image_size(filename,
memory_region_get_ram_ptr(bios),
BIOS_SIZE);
g_free(filename); g_free(filename);
if (bios_size < 0 || bios_size > BIOS_SIZE) { if (bios_size < 0) {
error_report("Could not load PowerPC BIOS '%s'", bios_name); error_report("Could not load PowerPC BIOS '%s'", bios_name);
exit(1); exit(1);
} }
@ -515,9 +517,11 @@ static void taihu_405ep_init(MachineState *machine)
&error_fatal); &error_fatal);
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) { if (filename) {
bios_size = load_image(filename, memory_region_get_ram_ptr(bios)); bios_size = load_image_size(filename,
memory_region_get_ram_ptr(bios),
BIOS_SIZE);
g_free(filename); g_free(filename);
if (bios_size < 0 || bios_size > BIOS_SIZE) { if (bios_size < 0) {
error_report("Could not load PowerPC BIOS '%s'", bios_name); error_report("Could not load PowerPC BIOS '%s'", bios_name);
exit(1); exit(1);
} }