[xen master] pass-through: provide two !HVM stubs

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] pass-through: provide two !HVM stubs

patchbot
commit fb1fbe0a8b89896dd5ac7d402c61a3b63d3c8a26
Author:     Jan Beulich <[hidden email]>
AuthorDate: Fri Oct 5 16:25:43 2018 +0200
Commit:     Jan Beulich <[hidden email]>
CommitDate: Fri Oct 5 16:25:43 2018 +0200

    pass-through: provide two !HVM stubs
   
    Older gcc (4.3 in my case), despite eliminating pci_clean_dpci_irqs()
    when !HVM, does not manage to also eliminate pci_clean_dpci_irq(). Cope
    with this.
   
    Signed-off-by: Jan Beulich <[hidden email]>
    Reviewed-by: Wei Liu <[hidden email]>
    Acked-by: Andrew Cooper <[hidden email]>
---
 xen/include/asm-x86/hvm/irq.h | 8 ++++++++
 xen/include/xen/iommu.h       | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h
index a2c9938ccf..5b7e90c179 100644
--- a/xen/include/asm-x86/hvm/irq.h
+++ b/xen/include/asm-x86/hvm/irq.h
@@ -180,7 +180,15 @@ int pt_pirq_iterate(struct domain *d,
                               struct hvm_pirq_dpci *, void *arg),
                     void *arg);
 
+#ifdef CONFIG_HVM
 bool pt_pirq_softirq_active(struct hvm_pirq_dpci *);
+#else
+static inline bool pt_pirq_softirq_active(struct hvm_pirq_dpci *dpci)
+{
+    return false;
+}
+#endif
+
 /* Modify state of a PCI INTx wire. */
 void hvm_pci_intx_assert(struct domain *d, unsigned int device,
                          unsigned int intx);
diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 7313957c81..73f876b9fb 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -129,7 +129,11 @@ int pt_irq_destroy_bind(struct domain *, const struct xen_domctl_bind_pt_irq *);
 void hvm_dpci_isairq_eoi(struct domain *d, unsigned int isairq);
 struct hvm_irq_dpci *domain_get_irq_dpci(const struct domain *);
 void free_hvm_irq_dpci(struct hvm_irq_dpci *dpci);
-bool_t pt_irq_need_timer(uint32_t flags);
+#ifdef CONFIG_HVM
+bool pt_irq_need_timer(uint32_t flags);
+#else
+static inline bool pt_irq_need_timer(unsigned int flags) { return false; }
+#endif
 
 struct msi_desc;
 struct msi_msg;
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog