[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/43] hw/pci/msi: Restrict xen_is_pirq_msi() call to Xen
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 05/43] hw/pci/msi: Restrict xen_is_pirq_msi() call to Xen |
Date: |
Sat, 9 Mar 2024 20:21:32 +0100 |
Similarly to the restriction in hw/pci/msix.c (see commit
e1e4bf2252 "msix: fix msix_vector_masked"), restrict the
xen_is_pirq_msi() call in msi_is_masked() to Xen.
No functional change intended.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20231114143816.71079-7-philmd@linaro.org>
---
hw/pci/msi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/pci/msi.c b/hw/pci/msi.c
index 041b0bdbec..8104ac1d91 100644
--- a/hw/pci/msi.c
+++ b/hw/pci/msi.c
@@ -23,6 +23,7 @@
#include "hw/xen/xen.h"
#include "qemu/range.h"
#include "qapi/error.h"
+#include "sysemu/xen.h"
#include "hw/i386/kvm/xen_evtchn.h"
@@ -308,7 +309,7 @@ bool msi_is_masked(const PCIDevice *dev, unsigned int
vector)
}
data = pci_get_word(dev->config + msi_data_off(dev, msi64bit));
- if (xen_is_pirq_msi(data)) {
+ if (xen_enabled() && xen_is_pirq_msi(data)) {
return false;
}
--
2.41.0
- [PULL 00/43] Misc HW patches for 2024-03-09, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 01/43] hw/i386: Rename kvmvapic.c -> vapic.c, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 02/43] sysemu/xen: Forbid using Xen headers in user emulation, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 03/43] sysemu/xen-mapcache: Check Xen availability with CONFIG_XEN_IS_POSSIBLE, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 04/43] system/physmem: Do not include 'hw/xen/xen.h' but 'sysemu/xen.h', Philippe Mathieu-Daudé, 2024/03/09
- [PULL 05/43] hw/pci/msi: Restrict xen_is_pirq_msi() call to Xen,
Philippe Mathieu-Daudé <=
- [PULL 06/43] hw/xen: Remove unnecessary xen_hvm_inject_msi() stub, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 07/43] hw/xen: Rename 'ram_memory' global variable as 'xen_memory', Philippe Mathieu-Daudé, 2024/03/09
- [PULL 08/43] hw/xen: Use target-agnostic qemu_target_page_bits(), Philippe Mathieu-Daudé, 2024/03/09
- [PULL 09/43] hw/xen/xen_pt: Add missing license, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 10/43] hw/xen: Extract 'xen_igd.h' from 'xen_pt.h', Philippe Mathieu-Daudé, 2024/03/09
- [PULL 11/43] hw/i386/xen: Compile 'xen-hvm.c' with Xen CPPFLAGS, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 12/43] hw/xen/hvm: Inline TARGET_PAGE_ALIGN() macro, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 13/43] hw/xen/hvm: Propagate page_mask to a pair of functions, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 14/43] hw/xen/hvm: Get target page size at runtime, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 15/43] hw/char/xen_console: Fix missing ERRP_GUARD() for error_prepend(), Philippe Mathieu-Daudé, 2024/03/09