diff options
| author | Cédric Le Goater <clg@kaod.org> | 2018-07-11 13:43:57 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2018-07-11 13:43:57 -0600 |
| commit | 26c0ae56386edacc8b0da40264748f59afedb1bb (patch) | |
| tree | e8ef197e1a2ab919ef7ec2f89223d0819710109d /hw/vfio | |
| parent | c447afd5783b9237fa51b7a85777007d8d568bfc (diff) | |
| download | qemu-26c0ae56386edacc8b0da40264748f59afedb1bb.zip qemu-26c0ae56386edacc8b0da40264748f59afedb1bb.tar.gz qemu-26c0ae56386edacc8b0da40264748f59afedb1bb.tar.bz2 | |
vfio/pci: do not set the PCIDevice 'has_rom' attribute
PCI devices needing a ROM allocate an optional MemoryRegion with
pci_add_option_rom(). pci_del_option_rom() does the cleanup when the
device is destroyed. The only action taken by this routine is to call
vmstate_unregister_ram() which clears the id string of the optional
ROM RAMBlock and now, also flags the RAMBlock as non-migratable. This
was recently added by commit b895de502717 ("migration: discard
non-migratable RAMBlocks"), .
VFIO devices do their own loading of the PCI option ROM in
vfio_pci_size_rom(). The memory region is switched to an I/O region
and the PCI attribute 'has_rom' is set but the RAMBlock of the ROM
region is not allocated. When the associated PCI device is deleted,
pci_del_option_rom() calls vmstate_unregister_ram() which tries to
flag a NULL RAMBlock, leading to a SEGV.
It seems that 'has_rom' was set to have memory_region_destroy()
called, but since commit 469b046ead06 ("memory: remove
memory_region_destroy") this is not necessary anymore as the
MemoryRegion is freed automagically.
Remove the PCIDevice 'has_rom' attribute setting in vfio.
Fixes: b895de502717 ("migration: discard non-migratable RAMBlocks")
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'hw/vfio')
| -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 a1577de..6cbb8fa 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; } |