[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/12] hw/i386/pc: Convert DPRINTF() to trace events
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 01/12] hw/i386/pc: Convert DPRINTF() to trace events |
Date: |
Fri, 13 Dec 2019 17:17:42 +0100 |
Convert the deprecated DPRINTF() macro to trace events.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
v2: rename pc_pic -> x86_pic
---
hw/i386/pc.c | 19 +++++--------------
hw/i386/trace-events | 6 ++++++
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ac08e63604..5f8e39c025 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -90,16 +90,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"
struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
@@ -348,7 +339,7 @@ void gsi_handler(void *opaque, int n, int level)
{
GSIState *s = opaque;
- DPRINTF("pc: %s GSI %d\n", level ? "raising" : "lowering", n);
+ trace_x86_gsi_interrupt(n, level);
if (n < ISA_NUM_IRQS) {
qemu_set_irq(s->i8259_irq[n], level);
}
@@ -426,7 +417,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_x86_pic_interrupt(irq, level);
if (cpu->apic_state && !kvm_irqchip_in_kernel()) {
CPU_FOREACH(cs) {
cpu = X86_CPU(cs);
@@ -760,7 +751,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)) {
@@ -775,7 +766,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 c8bc464bc5..a608a5b635 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
+x86_gsi_interrupt(int irqn, int level) "GSI interrupt #%d level:%d"
+x86_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"
--
2.21.0
- [PATCH 00/12] hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h', Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 01/12] hw/i386/pc: Convert DPRINTF() to trace events,
Philippe Mathieu-Daudé <=
- [PATCH 02/12] hw/i386/pc: Move kvm_i8259_init() declaration to sysemu/kvm.h, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 03/12] hw/i386/pc: Remove obsolete pc_pci_device_init() declaration, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 04/12] hw/i386/pc: Remove obsolete cpu_set_smm_t typedef, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 05/12] hw/i386/ich9: Remove unused include, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 06/12] hw/i386/ich9: Move unnecessary "pci_bridge.h" include, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 07/12] hw/ide/piix: Remove superfluous DEVICE() cast, Philippe Mathieu-Daudé, 2019/12/13