Commit 2933f698 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/core/loader.c: Remove load_image() 



The load_image() function is now no longer used anywhere, so
we can remove it completely. (Use load_image_size() or
g_file_get_contents() instead.)

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-10-peter.maydell@linaro.org
parent da885fe1

hw/core/loader.c

+0 −25
Original line number Diff line number Diff line
@@ -73,31 +73,6 @@ int64_t get_image_size(const char *filename) 
    return size;

}



/* return the size or -1 if error */

/* deprecated, because caller does not specify buffer size! */

int load_image(const char *filename, uint8_t *addr)

{

    int fd, size;

    fd = open(filename, O_RDONLY | O_BINARY);

    if (fd < 0)

        return -1;

    size = lseek(fd, 0, SEEK_END);

    if (size == -1) {

        fprintf(stderr, "file %-20s: get size error: %s\n",

                filename, strerror(errno));

        close(fd);

        return -1;

    }



    lseek(fd, 0, SEEK_SET);

    if (read(fd, addr, size) != size) {

        close(fd);

        return -1;

    }

    close(fd);

    return size;

}



/* return the size or -1 if error */

ssize_t load_image_size(const char *filename, void *addr, size_t size)

{

include/hw/loader.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 * On error, errno is also set as appropriate.

 */

int64_t get_image_size(const char *filename);

int load_image(const char *filename, uint8_t *addr); /* deprecated */

ssize_t load_image_size(const char *filename, void *addr, size_t size);



/**load_image_targphys_as: