aboutsummaryrefslogtreecommitdiff
path: root/hw/i386
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2019-12-13 11:50:57 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-12-17 19:33:50 +0100
commit4ca8dabdb8b58349c309cfd9624d3f96172a752b (patch)
tree2df2a52ae1880aa0156fdc4bcf9695b676f875fe /hw/i386
parented9e923c3c9a2c50c4e82ba178b3fb1feba56867 (diff)
downloadqemu-4ca8dabdb8b58349c309cfd9624d3f96172a752b.zip
qemu-4ca8dabdb8b58349c309cfd9624d3f96172a752b.tar.gz
qemu-4ca8dabdb8b58349c309cfd9624d3f96172a752b.tar.bz2
hw/i386/pc: Convert DPRINTF() to trace events
Convert the deprecated DPRINTF() macro to trace events. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/i386')
-rw-r--r--hw/i386/pc.c19
-rw-r--r--hw/i386/trace-events6
2 files changed, 11 insertions, 14 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e330a91..d3075e7 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -91,16 +91,7 @@
#include "config-devices.h"
#include "e820_memory_layout.h"
#include "fw_cfg.h"
-
-/* debug PC/ISA interrupts */
-//#define DEBUG_IRQ
-
-#ifdef DEBUG_IRQ
-#define DPRINTF(fmt, ...) \
- do { printf("CPUIRQ: " fmt , ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...)
-#endif
+#include "trace.h"
GlobalProperty pc_compat_4_2[] = {};
const size_t pc_compat_4_2_len = G_N_ELEMENTS(pc_compat_4_2);
@@ -350,7 +341,7 @@ void gsi_handler(void *opaque, int n, int level)
{
GSIState *s = opaque;
- DPRINTF("pc: %s GSI %d\n", level ? "raising" : "lowering", n);
+ trace_pc_gsi_interrupt(n, level);
if (n < ISA_NUM_IRQS) {
qemu_set_irq(s->i8259_irq[n], level);
}
@@ -428,7 +419,7 @@ static void pic_irq_request(void *opaque, int irq, int level)
CPUState *cs = first_cpu;
X86CPU *cpu = X86_CPU(cs);
- DPRINTF("pic_irqs: %s irq %d\n", level? "raise" : "lower", irq);
+ trace_pc_pic_interrupt(irq, level);
if (cpu->apic_state && !kvm_irqchip_in_kernel()) {
CPU_FOREACH(cs) {
cpu = X86_CPU(cs);
@@ -762,7 +753,7 @@ static void port92_write(void *opaque, hwaddr addr, uint64_t val,
Port92State *s = opaque;
int oldval = s->outport;
- DPRINTF("port92: write 0x%02" PRIx64 "\n", val);
+ trace_port92_write(val);
s->outport = val;
qemu_set_irq(s->a20_out, (val >> 1) & 1);
if ((val & 1) && !(oldval & 1)) {
@@ -777,7 +768,7 @@ static uint64_t port92_read(void *opaque, hwaddr addr,
uint32_t ret;
ret = s->outport;
- DPRINTF("port92: read 0x%02x\n", ret);
+ trace_port92_read(ret);
return ret;
}
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
index c8bc464..43f33cf 100644
--- a/hw/i386/trace-events
+++ b/hw/i386/trace-events
@@ -111,3 +111,9 @@ amdvi_ir_irte_ga_val(uint64_t hi, uint64_t lo) "hi 0x%"PRIx64" lo 0x%"PRIx64
# vmport.c
vmport_register(unsigned char command, void *func, void *opaque) "command: 0x%02x func: %p opaque: %p"
vmport_command(unsigned char command) "command: 0x%02x"
+
+# pc.c
+pc_gsi_interrupt(int irqn, int level) "GSI interrupt #%d level:%d"
+pc_pic_interrupt(int irqn, int level) "PIC interrupt #%d level:%d"
+port92_read(uint8_t val) "port92: read 0x%02x"
+port92_write(uint8_t val) "port92: write 0x%02x"