diff mbox series

[03/10] hw/smbios/smbios.c: Don't use load_image()

Message ID 20181130151712.2312-4-peter.maydell@linaro.org
State Superseded
Headers show
Series Remove deprecated load_image() function | expand

Commit Message

Peter Maydell Nov. 30, 2018, 3:17 p.m. UTC 
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/smbios/smbios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.19.1

Comments

Eric Blake Nov. 30, 2018, 8:21 p.m. UTC | #1 
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().

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

>   hw/smbios/smbios.c | 2 +-

>   1 file changed, 1 insertion(+), 1 deletion(-)


Reviewed-by: Eric Blake <eblake@redhat.com>


> 

> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c

> index 920939454e7..04811279a08 100644

> --- a/hw/smbios/smbios.c

> +++ b/hw/smbios/smbios.c

> @@ -982,7 +982,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)

>           header = (struct smbios_structure_header *)(smbios_tables +

>                                                       smbios_tables_len);

>   

> -        if (load_image(val, (uint8_t *)header) != size) {

> +        if (load_image_size(val, (uint8_t *)header, size) != size) {

>               error_setg(errp, "Failed to load SMBIOS file %s", val);

>               return;

>           }

> 


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org
diff mbox series

Patch

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 920939454e7..04811279a08 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -982,7 +982,7 @@  void smbios_entry_add(QemuOpts *opts, Error **errp)
         header = (struct smbios_structure_header *)(smbios_tables +
                                                     smbios_tables_len);
 
-        if (load_image(val, (uint8_t *)header) != size) {
+        if (load_image_size(val, (uint8_t *)header, size) != size) {
             error_setg(errp, "Failed to load SMBIOS file %s", val);
             return;
         }