mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apic: convert debug printf statements to tracepoints

Browse Source 
Replace debug printf statements with tracepoints.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-10-20 16:41:28 +00:00
parent 6df40080b0
commit d8023f3114
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hw/apic.c
View File

@ -21,23 +21,7 @@
#include "qemu-timer.h" #include "qemu-timer.h"
#include "host-utils.h" #include "host-utils.h"
#include "sysbus.h" #include "sysbus.h"
#include "trace.h"
//#define DEBUG_APIC
//#define DEBUG_COALESCING
#ifdef DEBUG_APIC
#define DPRINTF(fmt, ...) \
do { printf("apic: " fmt , ## __VA_ARGS__); } while (0)
#else
#define DPRINTF(fmt, ...)
#endif
#ifdef DEBUG_COALESCING
#define DPRINTF_C(fmt, ...) \
do { printf("apic: " fmt , ## __VA_ARGS__); } while (0)
#else
#define DPRINTF_C(fmt, ...)
#endif
/* APIC Local Vector Table */ /* APIC Local Vector Table */
#define APIC_LVT_TIMER 0 #define APIC_LVT_TIMER 0
@ -168,8 +152,8 @@ static void apic_local_deliver(APICState *s, int vector)
uint32_t lvt = s->lvt[vector]; uint32_t lvt = s->lvt[vector];
int trigger_mode; int trigger_mode;
DPRINTF("%s: vector %d delivery mode %d\n", __func__, vector, trace_apic_local_deliver(vector, (lvt >> 8) & 7);
(lvt >> 8) & 7);
if (lvt & APIC_LVT_MASKED) if (lvt & APIC_LVT_MASKED)
return; return;
@ -300,9 +284,9 @@ void apic_deliver_irq(uint8_t dest, uint8_t dest_mode,
{ {
uint32_t deliver_bitmask[MAX_APIC_WORDS]; uint32_t deliver_bitmask[MAX_APIC_WORDS];
DPRINTF("%s: dest %d dest_mode %d delivery_mode %d vector %d" trace_apic_deliver_irq(dest, dest_mode, delivery_mode, vector_num,
" polarity %d trigger_mode %d\n", __func__, dest, dest_mode, polarity, trigger_mode);
delivery_mode, vector_num, polarity, trigger_mode);
apic_get_delivery_bitmask(deliver_bitmask, dest, dest_mode); apic_get_delivery_bitmask(deliver_bitmask, dest, dest_mode);
apic_bus_deliver(deliver_bitmask, delivery_mode, vector_num, polarity, apic_bus_deliver(deliver_bitmask, delivery_mode, vector_num, polarity,
trigger_mode); trigger_mode);
@ -312,7 +296,8 @@ void cpu_set_apic_base(DeviceState *d, uint64_t val)
{ {
APICState *s = DO_UPCAST(APICState, busdev.qdev, d); APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
DPRINTF("cpu_set_apic_base: %016" PRIx64 "\n", val); trace_cpu_set_apic_base(val);
if (!s) if (!s)
return; return;
s->apicbase = (val & 0xfffff000) | s->apicbase = (val & 0xfffff000) |
@ -329,8 +314,8 @@ uint64_t cpu_get_apic_base(DeviceState *d)
{ {
APICState *s = DO_UPCAST(APICState, busdev.qdev, d); APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
DPRINTF("cpu_get_apic_base: %016" PRIx64 "\n", trace_cpu_get_apic_base(s ? (uint64_t)s->apicbase: 0);
s ? (uint64_t)s->apicbase: 0);
return s ? s->apicbase : 0; return s ? s->apicbase : 0;
} }
@ -402,20 +387,23 @@ static void apic_update_irq(APICState *s)
void apic_reset_irq_delivered(void) void apic_reset_irq_delivered(void)
{ {
DPRINTF_C("%s: old coalescing %d\n", __func__, apic_irq_delivered); trace_apic_reset_irq_delivered(apic_irq_delivered);
apic_irq_delivered = 0; apic_irq_delivered = 0;
} }
int apic_get_irq_delivered(void) int apic_get_irq_delivered(void)
{ {
DPRINTF_C("%s: returning coalescing %d\n", __func__, apic_irq_delivered); trace_apic_get_irq_delivered(apic_irq_delivered);
return apic_irq_delivered; return apic_irq_delivered;
} }
static void apic_set_irq(APICState *s, int vector_num, int trigger_mode) static void apic_set_irq(APICState *s, int vector_num, int trigger_mode)
{ {
apic_irq_delivered += !get_bit(s->irr, vector_num); apic_irq_delivered += !get_bit(s->irr, vector_num);
DPRINTF_C("%s: coalescing %d\n", __func__, apic_irq_delivered);
trace_apic_set_irq(apic_irq_delivered);
set_bit(s->irr, vector_num); set_bit(s->irr, vector_num);
if (trigger_mode) if (trigger_mode)
@ -769,7 +757,7 @@ static uint32_t apic_mem_readl(void *opaque, target_phys_addr_t addr)
val = 0; val = 0;
break; break;
} }
DPRINTF("read: " TARGET_FMT_plx " = %08x\n", addr, val); trace_apic_mem_readl(addr, val);
return val; return val;
} }
@ -805,7 +793,7 @@ static void apic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
} }
s = DO_UPCAST(APICState, busdev.qdev, d); s = DO_UPCAST(APICState, busdev.qdev, d);
DPRINTF("write: " TARGET_FMT_plx " = %08x\n", addr, val); trace_apic_mem_writel(addr, val);
switch(index) { switch(index) {
case 0x02: case 0x02:

12
trace-events
View File

@ -69,3 +69,15 @@ disable cpu_out(unsigned int addr, unsigned int val) "addr %#x value %u"
# balloon.c # balloon.c
# Since requests are raised via monitor, not many tracepoints are needed. # Since requests are raised via monitor, not many tracepoints are needed.
disable balloon_event(void *opaque, unsigned long addr) "opaque %p addr %lu" disable balloon_event(void *opaque, unsigned long addr) "opaque %p addr %lu"
# hw/apic.c
disable apic_local_deliver(int vector, uint32_t lvt) "vector %d delivery mode %d"
disable apic_deliver_irq(uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode, uint8_t vector_num, uint8_t polarity, uint8_t trigger_mode) "dest %d dest_mode %d delivery_mode %d vector %d polarity %d trigger_mode %d"
disable cpu_set_apic_base(uint64_t val) "%016"PRIx64""
disable cpu_get_apic_base(uint64_t val) "%016"PRIx64""
disable apic_mem_readl(uint64_t addr, uint32_t val) "%"PRIx64" = %08x"
disable apic_mem_writel(uint64_t addr, uint32_t val) "%"PRIx64" = %08x"
# coalescing
disable apic_reset_irq_delivered(int apic_irq_delivered) "old coalescing %d"
disable apic_get_irq_delivered(int apic_irq_delivered) "returning coalescing %d"
disable apic_set_irq(int apic_irq_delivered) "coalescing %d"