[Xen-devel] [PATCH 01/13] xen: fix output of xen_debug_interrupt

[Wei Liu <wei.liu2@xxxxxxxxxx>]

Four things are fixed:
 a) the test result of globaly masked event;
 b) make the per-cpu selector L1 to be consistent with description in
    __xen_evtchn_do_upcall's comment;
 c) the test result of L1 selector;
 d) add KERN_DEBUG in printk.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 drivers/xen/events.c |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 7595581..2c94aad 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -1176,7 +1176,7 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
 
        spin_lock_irqsave(&debug_lock, flags);
 
-       printk("\nvcpu %d\n  ", cpu);
+       printk(KERN_DEBUG "\nvcpu %d\n  ", cpu);
 
        for_each_online_cpu(i) {
                int pending;
@@ -1184,56 +1184,56 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
                pending = (get_irq_regs() && i == cpu)
                        ? xen_irqs_disabled(get_irq_regs())
                        : v->evtchn_upcall_mask;
-               printk("%d: masked=%d pending=%d event_sel %0*lx\n  ", i,
+               printk(KERN_DEBUG "%d: masked=%d pending=%d event_sel %0*lx\n  
", i,
                       pending, v->evtchn_upcall_pending,
                       (int)(sizeof(v->evtchn_pending_sel)*2),
                       v->evtchn_pending_sel);
        }
        v = per_cpu(xen_vcpu, cpu);
 
-       printk("\npending:\n   ");
+       printk(KERN_DEBUG "\npending:\n   ");
        for (i = ARRAY_SIZE(sh->evtchn_pending)-1; i >= 0; i--)
-               printk("%0*lx%s", (int)sizeof(sh->evtchn_pending[0])*2,
+               printk(KERN_DEBUG "%0*lx%s", 
(int)sizeof(sh->evtchn_pending[0])*2,
                       sh->evtchn_pending[i],
                       i % 8 == 0 ? "\n   " : " ");
-       printk("\nglobal mask:\n   ");
+       printk(KERN_DEBUG "\nglobal mask:\n   ");
        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
-               printk("%0*lx%s",
+               printk(KERN_DEBUG "%0*lx%s",
                       (int)(sizeof(sh->evtchn_mask[0])*2),
                       sh->evtchn_mask[i],
                       i % 8 == 0 ? "\n   " : " ");
 
-       printk("\nglobally unmasked:\n   ");
+       printk(KERN_DEBUG "\nglobally unmasked:\n   ");
        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
-               printk("%0*lx%s", (int)(sizeof(sh->evtchn_mask[0])*2),
+               printk(KERN_DEBUG "%0*lx%s", 
(int)(sizeof(sh->evtchn_mask[0])*2),
                       sh->evtchn_pending[i] & ~sh->evtchn_mask[i],
                       i % 8 == 0 ? "\n   " : " ");
 
-       printk("\nlocal cpu%d mask:\n   ", cpu);
+       printk(KERN_DEBUG "\nlocal cpu%d mask:\n   ", cpu);
        for (i = (NR_EVENT_CHANNELS/BITS_PER_LONG)-1; i >= 0; i--)
-               printk("%0*lx%s", (int)(sizeof(cpu_evtchn[0])*2),
+               printk(KERN_DEBUG "%0*lx%s", (int)(sizeof(cpu_evtchn[0])*2),
                       cpu_evtchn[i],
                       i % 8 == 0 ? "\n   " : " ");
 
-       printk("\nlocally unmasked:\n   ");
+       printk(KERN_DEBUG "\nlocally unmasked:\n   ");
        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--) {
                unsigned long pending = sh->evtchn_pending[i]
                        & ~sh->evtchn_mask[i]
                        & cpu_evtchn[i];
-               printk("%0*lx%s", (int)(sizeof(sh->evtchn_mask[0])*2),
+               printk(KERN_DEBUG "%0*lx%s", 
(int)(sizeof(sh->evtchn_mask[0])*2),
                       pending, i % 8 == 0 ? "\n   " : " ");
        }
 
-       printk("\npending list:\n");
+       printk(KERN_DEBUG "\npending list:\n");
        for (i = 0; i < NR_EVENT_CHANNELS; i++) {
                if (sync_test_bit(i, sh->evtchn_pending)) {
                        int word_idx = i / BITS_PER_LONG;
-                       printk("  %d: event %d -> irq %d%s%s%s\n",
+                       printk(KERN_DEBUG "  %d: event %d -> irq %d%s%s%s\n",
                               cpu_from_evtchn(i), i,
                               evtchn_to_irq[i],
-                              sync_test_bit(word_idx, &v->evtchn_pending_sel)
-                                            ? "" : " l2-clear",
-                              !sync_test_bit(i, sh->evtchn_mask)
+                              !sync_test_bit(word_idx, &v->evtchn_pending_sel)
+                                            ? "" : " l1-clear",
+                              sync_test_bit(i, sh->evtchn_mask)
                                             ? "" : " globally-masked",
                               sync_test_bit(i, cpu_evtchn)
                                             ? "" : " locally-masked");
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel