Commit 36bde091 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/pci/pci.c: 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.
Instead use load_image_size().

While we are converting this code, add an error-check
for read failure.

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>
Message-id: 20181130151712.2312-5-peter.maydell@linaro.org
parent b7abb791

hw/pci/pci.c

+5 −1
Original line number Diff line number Diff line
@@ -2261,7 +2261,11 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom, 
    pdev->has_rom = true;

    memory_region_init_rom(&pdev->rom, OBJECT(pdev), name, size, &error_fatal);

    ptr = memory_region_get_ram_ptr(&pdev->rom);

    load_image(path, ptr);

    if (load_image_size(path, ptr, size) < 0) {

        error_setg(errp, "failed to load romfile \"%s\"", pdev->romfile);

        g_free(path);

        return;

    }

    g_free(path);



    if (is_default_rom) {