Commit 9776874f authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/ppc/mac_newworld, mac_oldworld: Don't use load_image() 



The load_image() function is deprecated, as it does not let the
caller specify how large the buffer to read the file into is.
Use the glib g_file_get_contents() function instead, which does
the whole "allocate memory for the file and read it in" operation.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Message-id: 20181130151712.2312-2-peter.maydell@linaro.org
parent ed315040

hw/ppc/mac_newworld.c

+4 −6
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ static void ppc_core99_init(MachineState *machine) 
    MACIOIDEState *macio_ide;

    BusState *adb_bus;

    MacIONVRAMState *nvr;

    int bios_size, ndrv_size;

    uint8_t *ndrv_file;

    int bios_size;

    int ppc_boot_device;

    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];

    void *fw_cfg;
@@ -510,11 +509,10 @@ static void ppc_core99_init(MachineState *machine) 
    /* MacOS NDRV VGA driver */

    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, NDRV_VGA_FILENAME);

    if (filename) {

        ndrv_size = get_image_size(filename);

        if (ndrv_size != -1) {

            ndrv_file = g_malloc(ndrv_size);

            ndrv_size = load_image(filename, ndrv_file);

        gchar *ndrv_file;

        gsize ndrv_size;



        if (g_file_get_contents(filename, &ndrv_file, &ndrv_size, NULL)) {

            fw_cfg_add_file(fw_cfg, "ndrv/qemu_vga.ndrv", ndrv_file, ndrv_size);

        }

        g_free(filename);

hw/ppc/mac_oldworld.c

+4 −6
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ static void ppc_heathrow_init(MachineState *machine) 
    SysBusDevice *s;

    DeviceState *dev, *pic_dev;

    BusState *adb_bus;

    int bios_size, ndrv_size;

    uint8_t *ndrv_file;

    int bios_size;

    uint16_t ppc_boot_device;

    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];

    void *fw_cfg;
@@ -361,11 +360,10 @@ static void ppc_heathrow_init(MachineState *machine) 
    /* MacOS NDRV VGA driver */

    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, NDRV_VGA_FILENAME);

    if (filename) {

        ndrv_size = get_image_size(filename);

        if (ndrv_size != -1) {

            ndrv_file = g_malloc(ndrv_size);

            ndrv_size = load_image(filename, ndrv_file);

        gchar *ndrv_file;

        gsize ndrv_size;



        if (g_file_get_contents(filename, &ndrv_file, &ndrv_size, NULL)) {

            fw_cfg_add_file(fw_cfg, "ndrv/qemu_vga.ndrv", ndrv_file, ndrv_size);

        }

        g_free(filename);