[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 04/10] hw/pci/pci.c: Don't use load_image()
From: |
Peter Maydell |
Subject: |
[Qemu-ppc] [PATCH 04/10] hw/pci/pci.c: Don't use load_image() |
Date: |
Fri, 30 Nov 2018 15:17:06 +0000 |
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 <address@hidden>
---
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);
if (is_default_rom) {
--
2.19.1
- [Qemu-ppc] [PATCH 00/10] Remove deprecated load_image() function, Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 10/10] include/hw/loader.h: Document load_image_size(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 08/10] device_tree.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 06/10] hw/i386/multiboot.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 02/10] hw/ppc/ppc405_boards: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 04/10] hw/pci/pci.c: Don't use load_image(),
Peter Maydell <=
- [Qemu-ppc] [PATCH 03/10] hw/smbios/smbios.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 01/10] hw/ppc/mac_newworld, mac_oldworld: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 07/10] hw/block/tc58128.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 05/10] hw/i386/pc.c: Don't use load_image(), Peter Maydell, 2018/11/30
- [Qemu-ppc] [PATCH 09/10] hw/core/loader.c: Remove load_image(), Peter Maydell, 2018/11/30