When using xsplice, use of __LINE__ can generate spurious changes in
functions due to embedded line numbers. For release builds, remove the
use of these line numbers in IOMMU_WAIT_OP() and print the current text
address instead.
Signed-off-by: Ross Lagerwall <ross.lagerw...@citrix.com>
---
xen/drivers/passthrough/vtd/dmar.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/xen/drivers/passthrough/vtd/dmar.h
b/xen/drivers/passthrough/vtd/dmar.h
index 729b603..3a7bfe0 100644
--- a/xen/drivers/passthrough/vtd/dmar.h
+++ b/xen/drivers/passthrough/vtd/dmar.h
@@ -108,6 +108,15 @@ struct acpi_atsr_unit *acpi_find_matched_atsr_unit(const
struct pci_dev *);
#define DMAR_OPERATION_TIMEOUT MILLISECS(1000)
+#ifdef NDEBUG
+#define IOMMU_WAIT_OP_PANIC \
+ panic("%p: DMAR hardware is malfunctional", current_text_addr());
+#else
+#define IOMMU_WAIT_OP_PANIC \
+ panic("%s:%d:%s: DMAR hardware is malfunctional", \
+ __FILE__, __LINE__, __func__);
+#endif
+
#define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \
do { \
s_time_t start_time = NOW(); \
@@ -117,8 +126,7 @@ do { \
break; \
if ( NOW() > start_time + DMAR_OPERATION_TIMEOUT ) { \
if ( !kexecing ) \
- panic("%s:%d:%s: DMAR hardware is malfunctional",\
- __FILE__, __LINE__, __func__); \
+ IOMMU_WAIT_OP_PANIC \
else \
break; \
} \
--
2.4.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
