| Message ID | 1486561893-26470-2-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/02/2017 14:51, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> > --- > hw/display/cirrus_vga.c | 11 +++++------ > hw/display/trace-events | 6 ++++++ > 2 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c > index 16f27e8..b272a70 100644 > --- a/hw/display/cirrus_vga.c > +++ b/hw/display/cirrus_vga.c > @@ -28,6 +28,7 @@ > */ > #include "qemu/osdep.h" > #include "qapi/error.h" > +#include "trace.h" > #include "hw/hw.h" > #include "hw/pci/pci.h" > #include "ui/console.h" > @@ -1852,12 +1853,14 @@ static uint8_t cirrus_mmio_blt_read(CirrusVGAState * s, unsigned address) > break; > } > > + trace_vga_cirrus_write_blt(address, value); > return (uint8_t) value; > } > > static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address, > uint8_t value) > { > + trace_vga_cirrus_write_blt(address, value); > switch (address) { > case (CIRRUS_MMIO_BLTBGCOLOR + 0): > cirrus_vga_write_gr(s, 0x00, value); > @@ -2607,9 +2610,7 @@ static uint64_t cirrus_vga_ioport_read(void *opaque, hwaddr addr, > break; > } > } > -#if defined(DEBUG_VGA) > - printf("VGA: read addr=0x%04x data=0x%02x\n", addr, val); > -#endif > + trace_vga_cirrus_read_io(addr, 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)) { > return; > } > -#ifdef DEBUG_VGA > - printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val); > -#endif > + trace_vga_cirrus_write_io(addr, val); > > switch (addr) { > case 0x3c0: > diff --git a/hw/display/trace-events b/hw/display/trace-events > index 26910e2..3e896d2 100644 > --- a/hw/display/trace-events > +++ b/hw/display/trace-events > @@ -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_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" > + > +# 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" >
On 02/08/2017 10:51 AM, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > hw/display/cirrus_vga.c | 11 +++++------ > hw/display/trace-events | 6 ++++++ > 2 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c > index 16f27e8..b272a70 100644 > --- a/hw/display/cirrus_vga.c > +++ b/hw/display/cirrus_vga.c > @@ -28,6 +28,7 @@ > */ > #include "qemu/osdep.h" > #include "qapi/error.h" > +#include "trace.h" > #include "hw/hw.h" > #include "hw/pci/pci.h" > #include "ui/console.h" > @@ -1852,12 +1853,14 @@ static uint8_t cirrus_mmio_blt_read(CirrusVGAState * s, unsigned address) > break; > } > > + trace_vga_cirrus_write_blt(address, value); > return (uint8_t) value; > } > > static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address, > uint8_t value) > { > + trace_vga_cirrus_write_blt(address, value); > switch (address) { > case (CIRRUS_MMIO_BLTBGCOLOR + 0): > cirrus_vga_write_gr(s, 0x00, value); > @@ -2607,9 +2610,7 @@ static uint64_t cirrus_vga_ioport_read(void *opaque, hwaddr addr, > break; > } > } > -#if defined(DEBUG_VGA) > - printf("VGA: read addr=0x%04x data=0x%02x\n", addr, val); > -#endif > + trace_vga_cirrus_read_io(addr, 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)) { > return; > } > -#ifdef DEBUG_VGA > - printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val); > -#endif > + trace_vga_cirrus_write_io(addr, val); > > switch (addr) { > case 0x3c0: > diff --git a/hw/display/trace-events b/hw/display/trace-events > index 26910e2..3e896d2 100644 > --- a/hw/display/trace-events > +++ b/hw/display/trace-events > @@ -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_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" > + > +# 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" >
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 16f27e8..b272a70 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -28,6 +28,7 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" +#include "trace.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "ui/console.h" @@ -1852,12 +1853,14 @@ static uint8_t cirrus_mmio_blt_read(CirrusVGAState * s, unsigned address) break; } + trace_vga_cirrus_write_blt(address, value); return (uint8_t) value; } static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address, uint8_t value) { + trace_vga_cirrus_write_blt(address, value); switch (address) { case (CIRRUS_MMIO_BLTBGCOLOR + 0): cirrus_vga_write_gr(s, 0x00, value); @@ -2607,9 +2610,7 @@ static uint64_t cirrus_vga_ioport_read(void *opaque, hwaddr addr, break; } } -#if defined(DEBUG_VGA) - printf("VGA: read addr=0x%04x data=0x%02x\n", addr, val); -#endif + trace_vga_cirrus_read_io(addr, 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)) { return; } -#ifdef DEBUG_VGA - printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val); -#endif + trace_vga_cirrus_write_io(addr, val); switch (addr) { case 0x3c0: diff --git a/hw/display/trace-events b/hw/display/trace-events index 26910e2..3e896d2 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -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_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" + +# 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"
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/display/cirrus_vga.c | 11 +++++------ hw/display/trace-events | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-)