use new xen-internal API which allows stubdom to be registered to handle VIRQ_DOM_EXC
PATCH 15/24 use new xen-internal API which allows stubdom to be registered to handle VIRQ_DOM_EXC
Converts most users to the VIRQ handler functions introduced in the previous patch.
I sent these to Keir in an earlier state. See the explanation with xen_virq_handler_api.
Signed-off-by Diego Ongaro <[email protected]>
Signed-off-by Alex Zeffertt <[email protected]>
---
xen/arch/x86/cpu/mcheck/amd_nonfatal.c +1 -1
@@ -167,7 +167,7 @@/* If Dom0 enabled the VIRQ_MCA event, then ... */ if (event_enabled)/* ... notify it. */ -send_guest_global_virq (dom0,VIRQ_MCA ); +send_handler_global_virq (VIRQ_MCA );else /* ... or dump it */ x86_mcinfo_dump (mc_data);
xen/arch/x86/cpu/mcheck/mce_intel.c +12 -6
@@ -387,9 +387,11 @@*/ mi =machine_check_poll (MC_FLAG_CMCI );if (mi) { +struct domain *handler;x86_mcinfo_dump (mi); -if (dom0 &&guest_enabled_event (dom0->vcpu[0 ],VIRQ_MCA )) -send_guest_global_virq (dom0,VIRQ_MCA ); + handler =get_global_virq_handler (VIRQ_MCA ); +if (handler &&guest_enabled_event (handler->vcpu[0 ],VIRQ_MCA )) +send_guest_global_virq (handler,VIRQ_MCA ); } printk(KERN_DEBUG "CMCI: CPU%d owner_map[%lx], no_cmci_map[%lx]\n",
@@ -494,9 +496,11 @@printk (KERN_DEBUG "CMCI: cmci_intr happen on CPU%d\n" , cpu); mi =machine_check_poll (MC_FLAG_CMCI );if (mi) { +struct domain *handler;x86_mcinfo_dump (mi); -if (dom0 &&guest_enabled_event (dom0->vcpu[0 ],VIRQ_MCA )) -send_guest_global_virq (dom0,VIRQ_MCA ); + handler =get_global_virq_handler (VIRQ_MCA ); +if (handler &&guest_enabled_event (handler->vcpu[0 ],VIRQ_MCA )) +send_guest_global_virq (handler,VIRQ_MCA ); }irq_exit (); }
@@ -608,10 +612,12 @@ mi =machine_check_poll (MC_FLAG_POLLED );if (mi) { +struct domain *handler;x86_mcinfo_dump (mi); adjust++; -if (dom0 &&guest_enabled_event (dom0->vcpu[0 ],VIRQ_MCA )) -send_guest_global_virq (dom0,VIRQ_MCA ); + handler =get_global_virq_handler (VIRQ_MCA ); +if (handler &&guest_enabled_event (handler->vcpu[0 ],VIRQ_MCA )) +send_guest_global_virq (handler,VIRQ_MCA ); } }
xen/common/domain.c +4 -4
@@ -106,7 +106,7 @@if ( (d->shutdown_code == SHUTDOWN_suspend) && d->suspend_evtchn )evtchn_send (d, d->suspend_evtchn);else -send_guest_global_virq (dom0,VIRQ_DOM_EXC ); +send_handler_global_virq (VIRQ_DOM_EXC ); }static void vcpu_check_shutdown (struct vcpu *v)
@@ -388,7 +388,7 @@ } d->is_dying = DOMDYING_dead;put_domain (d); -send_guest_global_virq (dom0,VIRQ_DOM_EXC ); +send_handler_global_virq (VIRQ_DOM_EXC );/* fallthrough */ case DOMDYING_dead:break ;
@@ -538,7 +538,7 @@ for_each_vcpu ( d, v )vcpu_sleep_nosync (v); -send_guest_global_virq (dom0,VIRQ_DEBUGGER ); +send_handler_global_virq (VIRQ_DEBUGGER ); }/* Complete domain destroy after RCU readers are not holding old references. */
@@ -579,7 +579,7 @@xsm_free_security_domain (d);free_domain_struct (d); -send_guest_global_virq (dom0,VIRQ_DOM_EXC ); +send_handler_global_virq (VIRQ_DOM_EXC ); }/* Release resources belonging to task @p. */
xen/common/event_channel.c +8 -0
@@ -677,6 +677,14 @@send_guest_global_virq (_get_global_virq_handler (virq), virq); } +struct domain *get_global_virq_handler (int virq) +{ +ASSERT (virq >=0 && virq <NR_VIRQS ); +ASSERT (virq_is_global (virq)); + +return _get_global_virq_handler (virq); +} +int set_global_virq_handler (struct domain *d,int virq) {struct domain *old;
xen/common/trace.c +1 -1
@@ -409,7 +409,7 @@*/ static void trace_notify_dom0 (unsigned long unused) { -send_guest_global_virq (dom0,VIRQ_TBUF ); +send_handler_global_virq (VIRQ_TBUF ); } static DECLARE_TASKLET(trace_notify_dom0_tasklet, trace_notify_dom0, 0);
xen/drivers/char/console.c +2 -2
@@ -290,7 +290,7 @@if ( (serial_rx_prod-serial_rx_cons) !=SERIAL_RX_SIZE ) serial_rx_ring[SERIAL_RX_MASK (serial_rx_prod++)] = c;/* Always notify the guest: prevents receive path from getting stuck. */ -send_guest_global_virq (dom0,VIRQ_CONSOLE ); +send_handler_global_virq (VIRQ_CONSOLE ); }static void serial_rx (char c,struct cpu_user_regs *regs)
@@ -317,7 +317,7 @@static void notify_dom0_con_ring (unsigned long unused) { -send_guest_global_virq (dom0,VIRQ_CON_RING ); +send_handler_global_virq (VIRQ_CON_RING ); } static DECLARE_TASKLET(notify_dom0_con_ring_tasklet, notify_dom0_con_ring, 0);
xen/include/xen/event.h +8 -0
@@ -39,6 +39,14 @@* set_global_virq_handler), or dom0. */ void send_handler_global_virq (int virq); + +/* +* get_global_virq_handler: Get a global VIRQ handler. +* @virq: Virtual IRQ number (VIRQ_*), must be global +* Returns the explicitly set handler (see +* set_global_virq_handler), or dom0. +*/ +struct domain *get_global_virq_handler (int virq);/* * sent_global_virq_handler: Set a global VIRQ handler.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel