hw/core/loader: allow loading larger ROMs
PATCH v2 1/1 hw/core/loader: allow loading larger ROMs
The read() syscall is not guaranteed to return all data from a file. The default ROM loader implementation currently does not take this into account, instead failing if all bytes are not read at once. This change loads the ROM using load_image_size() instead, which correctly reads all data using multiple calls to read().
--- hw/core/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/core/loader.c +2 -3
@@ -1115,14 +1115,13 @@ ssize_t rom_add_file(const char *file, const char *fw_dir, rom->datasize = rom->romsize; rom->data =g_malloc0 (rom->datasize); -lseek (fd,0 ,SEEK_SET ); - rc =read (fd, rom->data, rom->datasize); +close (fd); + rc =load_image_size (rom->path, rom->data, rom->datasize);if (rc != rom->datasize) {fprintf (stderr,"rom: file %-20s: read error: rc=%zd (expected %zd)\n" , rom->name, rc, rom->datasize); goto err; } -close (fd);rom_insert (rom);if (rom->fw_file && fw_cfg) {const char *basename;
Signature · 1 line
2.45.2
Quoted 19 lines · Gregor Haas
The
read()syscall is not guaranteed to return all data from a file. The default ROM loader implementation currently does not take this into account, instead failing if all bytes are not read at once. This change loads the ROM usingload_image_size()instead, which correctly reads all data using multiple calls toread().Signed-off-by Gregor Haas <[email protected]>--- hw/core/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)hw/core/loader.c +0
-0@@ -1115,14 +1115,13 @@ ssize_t rom_add_file(const char *file, const char *fw_dir, rom->datasize = rom->romsize; rom->data =g_malloc0 (rom->datasize);
hw/core/loader.c ssize_t rom_add_file(const char *file, const char *fw_dir, · line 1125
Quoted 10 lines
hw/core/loader.c +2
-3-lseek (fd,0 ,SEEK_SET ); - rc =read (fd, rom->data, rom->datasize); +close (fd); + rc =load_image_size (rom->path, rom->data, rom->datasize);if (rc != rom->datasize) {fprintf (stderr,"rom: file %-20s: read error: rc=%zd (expected %zd)\n" , rom->name, rc, rom->datasize); goto err; } -close (fd);
This method can be simplified much more.
All of the original 'open', lseek, g_malloc0, read & close, can be replaced by something approximately like this (untested):
g_autoptr(GError) gerr = NULL;
if (!g_file_get_contents(file, &rom->data, &rom->datasize, &gerr)) {
fprintf(stderr, "unable to load ROM '%s': %s", file, gerr->message);
goto err;
}With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|