From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdBpR-0004vY-EQ for qemu-devel@nongnu.org; Mon, 13 Feb 2017 03:17:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdBpN-0004bd-Bv for qemu-devel@nongnu.org; Mon, 13 Feb 2017 03:17:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdBpN-0004ZK-6M for qemu-devel@nongnu.org; Mon, 13 Feb 2017 03:17:41 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0EF9AC05B1C7 for ; Mon, 13 Feb 2017 08:17:40 +0000 (UTC) From: Gerd Hoffmann Date: Mon, 13 Feb 2017 09:17:29 +0100 Message-Id: <1486973851-21645-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1486973851-21645-1-git-send-email-kraxel@redhat.com> References: <1486973851-21645-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 4/6] cirrus: replace debug printf with trace points List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 1486561893-26470-2-git-send-email-kraxel@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(CirrusVGAStat= e * s, unsigned address) break; } =20 + trace_vga_cirrus_write_blt(address, value); return (uint8_t) value; } =20 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=3D0x%04x data=3D0x%02x\n", addr, val); -#endif + trace_vga_cirrus_read_io(addr, val); return val; } =20 @@ -2626,9 +2627,7 @@ static void cirrus_vga_ioport_write(void *opaque, h= waddr addr, uint64_t val, if (vga_ioport_invalid(s, addr)) { return; } -#ifdef DEBUG_VGA - printf("VGA: write addr=3D0x%04x data=3D0x%02x\n", addr, val); -#endif + trace_vga_cirrus_write_io(addr, val); =20 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" --=20 1.8.3.1