|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 1/2] Fix undefined behaviour
Signed-off-by: Grzegorz Uriasz <gorbak25@xxxxxxxxx>
---
hw/xen/xen_pt_load_rom.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c
index a50a80837e..9f100dc159 100644
--- a/hw/xen/xen_pt_load_rom.c
+++ b/hw/xen/xen_pt_load_rom.c
@@ -38,12 +38,12 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev,
fp = fopen(rom_file, "r+");
if (fp == NULL) {
if (errno != ENOENT) {
- error_report("pci-assign: Cannot open %s: %s", rom_file,
strerror(errno));
+ warn_report("pci-assign: Cannot open %s: %s", rom_file,
strerror(errno));
}
return NULL;
}
if (fstat(fileno(fp), &st) == -1) {
- error_report("pci-assign: Cannot stat %s: %s", rom_file,
strerror(errno));
+ warn_report("pci-assign: Cannot stat %s: %s", rom_file,
strerror(errno));
goto close_rom;
}
@@ -59,10 +59,9 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev,
memset(ptr, 0xff, st.st_size);
if (!fread(ptr, 1, st.st_size, fp)) {
- error_report("pci-assign: Cannot read from host %s", rom_file);
- error_printf("Device option ROM contents are probably invalid "
- "(check dmesg).\nSkip option ROM probe with rombar=0, "
- "or load from file with romfile=\n");
+ warn_report("pci-assign: Cannot read from host %s", rom_file);
+ memory_region_unref(&dev->rom);
+ ptr = NULL;
goto close_rom;
}
--
2.26.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |