From 17ae93b12ddf22f2d794260a3dc2947858c625a0 Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Mon, 14 Oct 2013 10:14:38 +0200 Subject: debug: remove some event channel info from the 'i' and 'q' debug keys The 'i' key would always use VCPU0's selector word when printing the event channel state. Remove the incorrect output as a subsequent change will add the (correct) information to the 'e' key instead. When dumping domain information, printing the state of the VIRQ_DEBUG port is redundant -- this information is available via the 'e' key. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/irq.c | 5 +---- xen/common/keyhandler.c | 11 ++--------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index c61cc4679e..7f547ff0b6 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2262,14 +2262,11 @@ static void dump_irqs(unsigned char key) d = action->guest[i]; pirq = domain_irq_to_pirq(d, irq); info = pirq_info(d, pirq); - printk("%u:%3d(%c%c%c%c)", + printk("%u:%3d(%c%c%c)", d->domain_id, pirq, (test_bit(info->evtchn, &shared_info(d, evtchn_pending)) ? 'P' : '-'), - (test_bit(info->evtchn / BITS_PER_EVTCHN_WORD(d), - &vcpu_info(d->vcpu[0], evtchn_pending_sel)) ? - 'S' : '-'), (test_bit(info->evtchn, &shared_info(d, evtchn_mask)) ? 'M' : '-'), (info->masked ? 'M' : '-')); diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index b9ad1b5bd7..8e4b3f8266 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -310,16 +310,9 @@ static void dump_domains(unsigned char key) { for_each_vcpu ( d, v ) { - printk("Notifying guest %d:%d (virq %d, port %d, stat %d/%d/%d)\n", + printk("Notifying guest %d:%d (virq %d, port %d)\n", d->domain_id, v->vcpu_id, - VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG], - test_bit(v->virq_to_evtchn[VIRQ_DEBUG], - &shared_info(d, evtchn_pending)), - test_bit(v->virq_to_evtchn[VIRQ_DEBUG], - &shared_info(d, evtchn_mask)), - test_bit(v->virq_to_evtchn[VIRQ_DEBUG] / - BITS_PER_EVTCHN_WORD(d), - &vcpu_info(v, evtchn_pending_sel))); + VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG]); send_guest_vcpu_virq(v, VIRQ_DEBUG); } } -- cgit v1.2.3