OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vfio: Do not reattempt a failed rom read

Browse Source 
During lazy rom loading, if rom read fails, and the
guest attempts a read again, vfio will again attempt it.
Add a boolean to prevent this. There could be a case where
a failed rom read might succeed the next time because of
a device reset or such, but it's best to exclude unpredictable
behavior

Signed-off-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Bandan Das 2014-01-15 10:11:52 -07:00 committed by Alex Williamson
parent d20b43dfea
commit e638073c56
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/misc/vfio.c
View File

@ -191,6 +191,7 @@ typedef struct VFIODevice {
bool has_flr; bool has_flr;
bool has_pm_reset; bool has_pm_reset;
bool needs_reset; bool needs_reset;
bool rom_read_failed;
} VFIODevice; } VFIODevice;
typedef struct VFIOGroup { typedef struct VFIOGroup {
@ -1125,6 +1126,7 @@ static void vfio_pci_load_rom(VFIODevice *vdev)
vdev->rom_offset = reg_info.offset; vdev->rom_offset = reg_info.offset;
if (!vdev->rom_size) { if (!vdev->rom_size) {
vdev->rom_read_failed = true;
error_report("vfio-pci: Cannot read device rom at " error_report("vfio-pci: Cannot read device rom at "
"%04x:%02x:%02x.%x\n", "%04x:%02x:%02x.%x\n",
vdev->host.domain, vdev->host.bus, vdev->host.slot, vdev->host.domain, vdev->host.bus, vdev->host.slot,
@ -1163,6 +1165,9 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)
/* Load the ROM lazily when the guest tries to read it */ /* Load the ROM lazily when the guest tries to read it */
if (unlikely(!vdev->rom)) { if (unlikely(!vdev->rom)) {
vfio_pci_load_rom(vdev); vfio_pci_load_rom(vdev);
if (unlikely(!vdev->rom && !vdev->rom_read_failed)) {
vfio_pci_load_rom(vdev);
}
} }
memcpy(&val, vdev->rom + addr, memcpy(&val, vdev->rom + addr,
@ -1230,6 +1235,7 @@ static void vfio_pci_size_rom(VFIODevice *vdev)
PCI_BASE_ADDRESS_SPACE_MEMORY, &vdev->pdev.rom); PCI_BASE_ADDRESS_SPACE_MEMORY, &vdev->pdev.rom);
vdev->pdev.has_rom = true; vdev->pdev.has_rom = true;
vdev->rom_read_failed = false;
} }
static void vfio_vga_write(void *opaque, hwaddr addr, static void vfio_vga_write(void *opaque, hwaddr addr,