| Message ID | 1455538275-5673-1-git-send-email-stefano.stabellini@eu.citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Stefano Stabellini <stefano.stabellini@eu.citrix.com> writes: > Only return true from xen_is_pirq_msi when Xen is enabled: the function > should never identify an MSI as Xen pirq when not running on Xen. Is this supposed to fix ivshmem-test with SPEED=slow?
On Mon, 15 Feb 2016, Markus Armbruster wrote: > Stefano Stabellini <stefano.stabellini@eu.citrix.com> writes: > > > Only return true from xen_is_pirq_msi when Xen is enabled: the function > > should never identify an MSI as Xen pirq when not running on Xen. > > Is this supposed to fix ivshmem-test with SPEED=slow? From the thread I think that the following http://marc.info/?l=qemu-devel&m=145538967606777 should be the fix.
diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 537fdba..fc03b35 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -83,7 +83,7 @@ static bool msix_vector_masked(PCIDevice *dev, unsigned int vector, bool fmask) uint8_t *data = &dev->msix_table[offset + PCI_MSIX_ENTRY_DATA]; /* MSIs on Xen can be remapped into pirqs. In those cases, masking * and unmasking go through the PV evtchn path. */ - if (xen_enabled() && xen_is_pirq_msi(pci_get_long(data))) { + if (xen_is_pirq_msi(pci_get_long(data))) { return false; } return fmask || dev->msix_table[offset + PCI_MSIX_ENTRY_VECTOR_CTRL] & diff --git a/xen-hvm.c b/xen-hvm.c index 039680a..991f6b7 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -151,7 +151,8 @@ int xen_is_pirq_msi(uint32_t msi_data) /* If vector is 0, the msi is remapped into a pirq, passed as * dest_id. */ - return ((msi_data & MSI_DATA_VECTOR_MASK) >> MSI_DATA_VECTOR_SHIFT) == 0; + return xen_enabled() && + ((msi_data & MSI_DATA_VECTOR_MASK) >> MSI_DATA_VECTOR_SHIFT) == 0; } void xen_hvm_inject_msi(uint64_t addr, uint32_t data)
Only return true from xen_is_pirq_msi when Xen is enabled: the function should never identify an MSI as Xen pirq when not running on Xen. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> CC: mst@redhat.com CC: berrange@redhat.com CC: xen-devel@lists.xen.org --- hw/pci/msix.c | 2 +- xen-hvm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)