|
 |
9ae3a8 |
From d6d48e0a9ce4dfc91085e450f2a9a334b1ece89b Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Alex Williamson <alex.williamson@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 10 Apr 2015 16:33:51 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 03/14] vfio: Correction in vfio_rom_read when attempting rom
|
|
|
9ae3a8 |
loading
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <20150410163351.15324.30965.stgit@gimli.home>
|
|
|
9ae3a8 |
Patchwork-id: 64785
|
|
|
9ae3a8 |
O-Subject: [RHEL7.2 qemu-kvm PATCH 3/8] vfio: Correction in vfio_rom_read when attempting rom loading
|
|
|
9ae3a8 |
Bugzilla: 1210503
|
|
|
9ae3a8 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Upstream: db01eedb6d883a1fed5b4079f8a6ff048b9c1217
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
commit e638073c569e801ce9de added a flag to track whether
|
|
|
9ae3a8 |
a previous rom read had failed. Accidentally, the code
|
|
|
9ae3a8 |
ended up adding vfio_load_option_rom twice. (Thanks to Alex
|
|
|
9ae3a8 |
for spotting it)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/misc/vfio.c | 5 +----
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
|
|
|
9ae3a8 |
index f3bf491..57bc974 100644
|
|
|
9ae3a8 |
--- a/hw/misc/vfio.c
|
|
|
9ae3a8 |
+++ b/hw/misc/vfio.c
|
|
|
9ae3a8 |
@@ -1235,11 +1235,8 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)
|
|
|
9ae3a8 |
uint64_t val = ((uint64_t)1 << (size * 8)) - 1;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* Load the ROM lazily when the guest tries to read it */
|
|
|
9ae3a8 |
- if (unlikely(!vdev->rom)) {
|
|
|
9ae3a8 |
+ if (unlikely(!vdev->rom && !vdev->rom_read_failed)) {
|
|
|
9ae3a8 |
vfio_pci_load_rom(vdev);
|
|
|
9ae3a8 |
- if (unlikely(!vdev->rom && !vdev->rom_read_failed)) {
|
|
|
9ae3a8 |
- vfio_pci_load_rom(vdev);
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
memcpy(&val, vdev->rom + addr,
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|