[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] xen: xen_is_pirq_msi only when xen_enabled()
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PATCH] xen: xen_is_pirq_msi only when xen_enabled() |
Date: |
Mon, 15 Feb 2016 12:11:15 +0000 |
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 <address@hidden>
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/pci/msix.c | 2 +-
xen-hvm.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
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)
--
1.7.10.4
- [Qemu-devel] [PATCH] xen: xen_is_pirq_msi only when xen_enabled(),
Stefano Stabellini <=