| Message ID | 20181130151712.2312-5-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Remove deprecated load_image() function | expand |
On 11/30/18 9:17 AM, 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(). Commit message should mention the addition of error checking. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/pci/pci.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 56b13b3320e..efb5ce196ff 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -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); But the code change itself is fine: Reviewed-by: Eric Blake <eblake@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 56b13b3320e..efb5ce196ff 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -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) {
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 <peter.maydell@linaro.org> --- hw/pci/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.19.1