ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cirrus: replace debug printf with trace points 

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1486561893-26470-2-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-02-08 14:51:33 +01:00
parent cf7dabeebc
commit ec87f206d7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/display/cirrus_vga.c
View File

@ -28,6 +28,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "trace.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "ui/console.h" #include "ui/console.h"
@ -1852,12 +1853,14 @@ static uint8_t cirrus_mmio_blt_read(CirrusVGAState * s, unsigned address)
break; break;
} }
trace_vga_cirrus_write_blt(address, value);
return (uint8_t) value; return (uint8_t) value;
} }
static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address, static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address,
uint8_t value) uint8_t value)
{ {
trace_vga_cirrus_write_blt(address, value);
switch (address) { switch (address) {
case (CIRRUS_MMIO_BLTBGCOLOR + 0): case (CIRRUS_MMIO_BLTBGCOLOR + 0):
cirrus_vga_write_gr(s, 0x00, value); cirrus_vga_write_gr(s, 0x00, value);
@ -2607,9 +2610,7 @@ static uint64_t cirrus_vga_ioport_read(void *opaque, hwaddr addr,
break; break;
} }
} }
#if defined(DEBUG_VGA) trace_vga_cirrus_read_io(addr, val);
printf("VGA: read addr=0x%04x data=0x%02x\n", addr, val);
#endif
return val; return val;
} }
@ -2626,9 +2627,7 @@ static void cirrus_vga_ioport_write(void *opaque, hwaddr addr, uint64_t val,
if (vga_ioport_invalid(s, addr)) { if (vga_ioport_invalid(s, addr)) {
return; return;
} }
#ifdef DEBUG_VGA trace_vga_cirrus_write_io(addr, val);
printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val);
#endif
switch (addr) { switch (addr) {
case 0x3c0: case 0x3c0:

6
hw/display/trace-events
View File

@ -125,3 +125,9 @@ vga_std_read_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x"
vga_std_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" vga_std_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x"
vga_vbe_read(uint32_t index, uint32_t val) "index 0x%x, val 0x%x" vga_vbe_read(uint32_t index, uint32_t val) "index 0x%x, val 0x%x"
vga_vbe_write(uint32_t index, uint32_t val) "index 0x%x, val 0x%x" vga_vbe_write(uint32_t index, uint32_t val) "index 0x%x, val 0x%x"
# hw/display/cirrus_vga.c
vga_cirrus_read_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x"
vga_cirrus_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x"
vga_cirrus_read_blt(uint32_t offset, uint32_t val) "offset 0x%x, val 0x%x"
vga_cirrus_write_blt(uint32_t offset, uint32_t val) "offset 0x%x, val 0x%x"