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 <jbeulich@suse.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h
index a2c9938ccf0d18daf477ba41d04735e5fb1a87ae..5b7e90c179f7da692c27e3b45e96f34910e58f61 100644 (file)
--- 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 7313957c81943aed4104fd80b96787d67b4cdcc3..73f876b9fb16b5618df7318e8aeebb7a0c98ae84 100644 (file)
--- 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;