diff options
| author | Peter Maydell | 2018-07-12 12:05:21 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-12 12:05:21 +0200 |
| commit | 87130a0d43158f046873a7de7e1df45c45d6c8a8 (patch) | |
| tree | 9e2e895376ed79f038fbbe8bcdc0dbae810fdb44 | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-07-11' in... (diff) | |
| parent | vfio/pci: do not set the PCIDevice 'has_rom' attribute (diff) | |
| download | qemu-87130a0d43158f046873a7de7e1df45c45d6c8a8.tar.gz qemu-87130a0d43158f046873a7de7e1df45c45d6c8a8.tar.xz qemu-87130a0d43158f046873a7de7e1df45c45d6c8a8.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20180711.1' into staging
VFIO fixes 2018-07-11
- Avoid RAMBlock segfault in option ROM teardown for vfio-pci devices
(Cédric Le Goater)
# gpg: Signature made Wed 11 Jul 2018 20:44:44 BST
# gpg: using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg: aka "Alex Williamson <alex@shazbot.org>"
# gpg: aka "Alex Williamson <alwillia@redhat.com>"
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22
* remotes/awilliam/tags/vfio-fixes-20180711.1:
vfio/pci: do not set the PCIDevice 'has_rom' attribute
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/vfio/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index a1577dea7f..6cbb8fa054 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -990,7 +990,6 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev) pci_register_bar(&vdev->pdev, PCI_ROM_SLOT, PCI_BASE_ADDRESS_SPACE_MEMORY, &vdev->pdev.rom); - vdev->pdev.has_rom = true; vdev->rom_read_failed = false; } |