[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] x86: remove the domain parameter from the guest EOI functions.
# HG changeset patch # User Jan Beulich <jbeulich@xxxxxxxxxx> # Date 1309549614 -3600 # Node ID 2ad4262cac39616506f3c0e0dba6ae3590412ace # Parent c9b383a4d96e89bd0fbd8b30ffba0b1f1602da2b x86: remove the domain parameter from the guest EOI functions. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx> --- diff -r c9b383a4d96e -r 2ad4262cac39 xen/arch/ia64/xen/hypercall.c --- a/xen/arch/ia64/xen/hypercall.c Fri Jul 01 20:45:21 2011 +0100 +++ b/xen/arch/ia64/xen/hypercall.c Fri Jul 01 20:46:54 2011 +0100 @@ -70,7 +70,7 @@ evtchn_unmask(pirq_to_evtchn(d, pirq)); spin_unlock(&d->event_lock); } - return pirq_guest_eoi(d, pirq); + return pirq_guest_eoi(pirq); } long do_pirq_guest_eoi(int pirq) diff -r c9b383a4d96e -r 2ad4262cac39 xen/arch/ia64/xen/irq.c --- a/xen/arch/ia64/xen/irq.c Fri Jul 01 20:45:21 2011 +0100 +++ b/xen/arch/ia64/xen/irq.c Fri Jul 01 20:46:54 2011 +0100 @@ -425,7 +425,7 @@ return ACKTYPE_NONE; } -int pirq_guest_eoi(struct domain *d, struct pirq *pirq) +int pirq_guest_eoi(struct pirq *pirq) { irq_desc_t *desc; irq_guest_action_t *action; @@ -466,7 +466,7 @@ pirq = pirqs[i]->pirq; if ( pirqs[i]->masked && !test_bit(pirqs[i]->evtchn, &s->evtchn_mask[0]) ) - pirq_guest_eoi(d, pirqs[i]); + pirq_guest_eoi(pirqs[i]); } } while ( ++pirq < d->nr_pirqs && n == ARRAY_SIZE(pirqs) ); diff -r c9b383a4d96e -r 2ad4262cac39 xen/arch/x86/irq.c --- a/xen/arch/x86/irq.c Fri Jul 01 20:45:21 2011 +0100 +++ b/xen/arch/x86/irq.c Fri Jul 01 20:46:54 2011 +0100 @@ -1158,17 +1158,17 @@ flush_ready_eoi(); } -void pirq_guest_eoi(struct domain *d, struct pirq *pirq) +void pirq_guest_eoi(struct pirq *pirq) { struct irq_desc *desc; ASSERT(local_irq_is_enabled()); desc = pirq_spin_lock_irq_desc(pirq, NULL); if ( desc ) - desc_guest_eoi(d, desc, pirq); + desc_guest_eoi(desc, pirq); } -void desc_guest_eoi(struct domain *d, struct irq_desc *desc, struct pirq *pirq) +void desc_guest_eoi(struct irq_desc *desc, struct pirq *pirq) { irq_guest_action_t *action; cpumask_t cpu_eoi_map; @@ -1238,7 +1238,7 @@ pirq = pirqs[i]->pirq; if ( pirqs[i]->masked && !test_bit(pirqs[i]->evtchn, &shared_info(d, evtchn_mask)) ) - pirq_guest_eoi(d, pirqs[i]); + pirq_guest_eoi(pirqs[i]); } } while ( ++pirq < d->nr_pirqs && n == ARRAY_SIZE(pirqs) ); diff -r c9b383a4d96e -r 2ad4262cac39 xen/arch/x86/physdev.c --- a/xen/arch/x86/physdev.c Fri Jul 01 20:45:21 2011 +0100 +++ b/xen/arch/x86/physdev.c Fri Jul 01 20:46:54 2011 +0100 @@ -271,7 +271,7 @@ evtchn_unmask(pirq->evtchn); if ( !is_hvm_domain(v->domain) || pirq->arch.hvm.emuirq == IRQ_PT ) - pirq_guest_eoi(v->domain, pirq); + pirq_guest_eoi(pirq); spin_unlock(&v->domain->event_lock); ret = 0; break; diff -r c9b383a4d96e -r 2ad4262cac39 xen/drivers/passthrough/io.c --- a/xen/drivers/passthrough/io.c Fri Jul 01 20:45:21 2011 +0100 +++ b/xen/drivers/passthrough/io.c Fri Jul 01 20:46:54 2011 +0100 @@ -44,7 +44,7 @@ { pirq_dpci->masked = 0; pirq_dpci->pending = 0; - pirq_guest_eoi(d, dpci_pirq(pirq_dpci)); + pirq_guest_eoi(dpci_pirq(pirq_dpci)); } return 0; @@ -182,7 +182,7 @@ if ( pirq_dpci->gmsi.gvec != pt_irq_bind->u.msi.gvec || pirq_dpci->gmsi.gflags != pt_irq_bind->u.msi.gflags) { /* Directly clear pending EOIs before enabling new MSI info. */ - pirq_guest_eoi(d, info); + pirq_guest_eoi(info); pirq_dpci->gmsi.gvec = pt_irq_bind->u.msi.gvec; pirq_dpci->gmsi.gflags = pt_irq_bind->u.msi.gflags; @@ -422,7 +422,7 @@ #ifdef SUPPORT_MSI_REMAPPING /* called with d->event_lock held */ -static void __msi_pirq_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) +static void __msi_pirq_eoi(struct hvm_pirq_dpci *pirq_dpci) { irq_desc_t *desc; @@ -437,7 +437,7 @@ return; desc->status &= ~IRQ_INPROGRESS; - desc_guest_eoi(d, desc, pirq); + desc_guest_eoi(desc, pirq); } } @@ -455,7 +455,7 @@ if ( vlapic_match_dest(vcpu_vlapic(current), NULL, 0, dest, dest_mode) ) { - __msi_pirq_eoi(d, pirq_dpci); + __msi_pirq_eoi(pirq_dpci); return 1; } } @@ -515,7 +515,7 @@ if ( pirq_dpci->flags & HVM_IRQ_DPCI_TRANSLATE ) { /* for translated MSI to INTx interrupt, eoi as early as possible */ - __msi_pirq_eoi(d, pirq_dpci); + __msi_pirq_eoi(pirq_dpci); } #endif } @@ -570,7 +570,7 @@ return; stop_timer(&pirq_dpci->timer); - pirq_guest_eoi(d, pirq); + pirq_guest_eoi(pirq); } void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, diff -r c9b383a4d96e -r 2ad4262cac39 xen/drivers/passthrough/vtd/x86/vtd.c --- a/xen/drivers/passthrough/vtd/x86/vtd.c Fri Jul 01 20:45:21 2011 +0100 +++ b/xen/drivers/passthrough/vtd/x86/vtd.c Fri Jul 01 20:46:54 2011 +0100 @@ -85,7 +85,7 @@ if ( --pirq_dpci->pending == 0 ) { stop_timer(&pirq_dpci->timer); - pirq_guest_eoi(d, dpci_pirq(pirq_dpci)); + pirq_guest_eoi(dpci_pirq(pirq_dpci)); } } } diff -r c9b383a4d96e -r 2ad4262cac39 xen/include/xen/irq.h --- a/xen/include/xen/irq.h Fri Jul 01 20:45:21 2011 +0100 +++ b/xen/include/xen/irq.h Fri Jul 01 20:46:54 2011 +0100 @@ -162,8 +162,8 @@ #define pirq_cleanup_check(pirq, d) \ ((pirq)->evtchn ? pirq_cleanup_check(pirq, d) : (void)0) -extern void pirq_guest_eoi(struct domain *, struct pirq *); -extern void desc_guest_eoi(struct domain *, struct irq_desc *, struct pirq *); +extern void pirq_guest_eoi(struct pirq *); +extern void desc_guest_eoi(struct irq_desc *, struct pirq *); extern int pirq_guest_unmask(struct domain *d); extern int pirq_guest_bind(struct vcpu *, struct pirq *, int will_share); extern void pirq_guest_unbind(struct domain *d, struct pirq *); _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |