From 8d07d6c46597a885eb38d99cc6fff399ce69cd21 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Tue, 12 Nov 2013 11:53:24 -0700 Subject: 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. Cc: qemu-stable@nongnu.org Signed-off-by: Alex Williamson Signed-off-by: Paolo Bonzini --- hw/misc/vfio.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'hw/misc') diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index fe95e03d1d..f7f8a19ee8 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -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 -- cgit v1.2.1