diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2013-10-14 10:14:38 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-10-14 10:14:38 +0200 |
| commit | 17ae93b12ddf22f2d794260a3dc2947858c625a0 (patch) | |
| tree | 506ec7b4537584312b61bb51b1aba50cf785af5d | |
| parent | 699be3096ce62e2d6ef953b2a223c34330598ac8 (diff) | |
| download | xen-17ae93b12ddf22f2d794260a3dc2947858c625a0.tar.gz xen-17ae93b12ddf22f2d794260a3dc2947858c625a0.tar.bz2 xen-17ae93b12ddf22f2d794260a3dc2947858c625a0.zip | |
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 <david.vrabel@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/arch/x86/irq.c | 5 | ||||
| -rw-r--r-- | 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); } } |