[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 02/10] hw/ppc/ppc405_boards: Don't use load_image(
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 02/10] hw/ppc/ppc405_boards: Don't use load_image() |
Date: |
Sun, 2 Dec 2018 19:55:12 +1100 |
User-agent: |
Mutt/1.10.1 (2018-07-13) |
On Fri, Nov 30, 2018 at 03:17:04PM +0000, Peter Maydell wrote:
> 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>
Acked-by: David Gibson <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);
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-ppc] [PATCH 02/10] hw/ppc/ppc405_boards: Don't use load_image(),
David Gibson <=