[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 02/10] hw/ppc/ppc405_boards: Don't use load_image()
From: |
Peter Maydell |
Subject: |
[Qemu-ppc] [PATCH 02/10] hw/ppc/ppc405_boards: Don't use load_image() |
Date: |
Fri, 30 Nov 2018 15:17:04 +0000 |
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 <address@hidden>
---
hw/ppc/ppc405_boards.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 3be3fe4432b..1b0a0a8ba3a 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -219,9 +219,11 @@ static void ref405ep_init(MachineState *machine)
bios_name = BIOS_FILENAME;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
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);
- if (bios_size < 0 || bios_size > BIOS_SIZE) {
+ if (bios_size < 0) {
error_report("Could not load PowerPC BIOS '%s'", bios_name);
exit(1);
}
@@ -515,9 +517,11 @@ static void taihu_405ep_init(MachineState *machine)
&error_fatal);
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
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);
- if (bios_size < 0 || bios_size > BIOS_SIZE) {
+ if (bios_size < 0) {
error_report("Could not load PowerPC BIOS '%s'", bios_name);
exit(1);
}
--
2.19.1
- [Qemu-ppc] [PATCH 00/10] Remove deprecated load_image() function, Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 10/10] include/hw/loader.h: Document load_image_size(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 08/10] device_tree.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 06/10] hw/i386/multiboot.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 02/10] hw/ppc/ppc405_boards: Don't use load_image(),
Peter Maydell <=
- [Qemu-ppc] [PATCH 04/10] hw/pci/pci.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 03/10] hw/smbios/smbios.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 01/10] hw/ppc/mac_newworld, mac_oldworld: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 07/10] hw/block/tc58128.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 05/10] hw/i386/pc.c: Don't use load_image(), Peter Maydell, 2018/11/30