vfio-pci: Fix multifunction=on
PATCH 1/1 vfio-pci: Fix multifunction=on
When an assigned device is initialized it copies the device config space into the emulated config space. Unfortunately multifunction is setup prior to the device initfn and gets clobbered. We need to restore it just like pci-assign does.
---
Anthony, please apply directly or let me know if you'd prefer a pull request. Thanks
hw/misc/vfio.c | 7 +++++++ 1 file changed, 7 insertions(+)
hw/misc/vfio.c +7 -0
@@ -3568,6 +3568,13 @@ static int vfio_initfn(PCIDevice *pdev) vdev->emulated_config_bits[PCI_HEADER_TYPE ] =PCI_HEADER_TYPE_MULTI_FUNCTION ; +/* Restore or clear multifunction, this is always controlled by QEMU */ +if (vdev->pdev.cap_present &QEMU_PCI_CAP_MULTIFUNCTION ) { + vdev->pdev.config[PCI_HEADER_TYPE ] |=PCI_HEADER_TYPE_MULTI_FUNCTION ; + }else { + vdev->pdev.config[PCI_HEADER_TYPE ] &= ~PCI_HEADER_TYPE_MULTI_FUNCTION ; + } +/* * Clear host resource mapping info. If we choose not to register a * BAR, such as might be the case with the option ROM, we can get
Quoted 23 lines · Alex Williamson
When an assigned device is initialized it copies the device config space into the emulated config space. Unfortunately multifunction is setup prior to the device initfn and gets clobbered. We need to restore it just like pci-assign does.
Signed-off-by Alex Williamson <[email protected]>---
Anthony, please apply directly or let me know if you'd prefer a pull request. Thanks
hw/misc/vfio.c | 7 +++++++ 1 file changed, 7 insertions(+)hw/misc/vfio.c +0
-0@@ -3568,6 +3568,13 @@ static int vfio_initfn(PCIDevice *pdev) vdev->emulated_config_bits[PCI_HEADER_TYPE ] =PCI_HEADER_TYPE_MULTI_FUNCTION ;
hw/misc/vfio.c static int vfio_initfn(PCIDevice *pdev) · line 3580
Quoted 10 lines
hw/misc/vfio.c +7
-0+/* Restore or clear multifunction, this is always controlled by QEMU */ +if (vdev->pdev.cap_present &QEMU_PCI_CAP_MULTIFUNCTION ) { + vdev->pdev.config[PCI_HEADER_TYPE ] |=PCI_HEADER_TYPE_MULTI_FUNCTION ; + }else { + vdev->pdev.config[PCI_HEADER_TYPE ] &= ~PCI_HEADER_TYPE_MULTI_FUNCTION ; + } +/* * Clear host resource mapping info. If we choose not to register a * BAR, such as might be the case with the option ROM, we can get