From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SiqPT-0007Ml-Qg for qemu-devel@nongnu.org; Sun, 24 Jun 2012 13:15:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SiqPR-0004SW-Db for qemu-devel@nongnu.org; Sun, 24 Jun 2012 13:15:39 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:55753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SiqPQ-0004R8-Rk for qemu-devel@nongnu.org; Sun, 24 Jun 2012 13:15:37 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 24 Jun 2012 19:15:41 +0200 Message-Id: <1340558142-14532-9-git-send-email-hpoussin@reactos.org> In-Reply-To: <1340558142-14532-1-git-send-email-hpoussin@reactos.org> References: <1340558142-14532-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 8/9] esp: use trace framework instead of stderr output List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Kevin Wolf , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/esp.c | 13 ++++++------- trace-events | 3 +++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/esp.c b/hw/esp.c index 796cdc1..ec40d93 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -26,6 +26,7 @@ #include "scsi.h" #include "esp.h" #include "trace.h" +#include "qemu-log.h" =20 /* * On Sparc32, this is the ESP (NCR53C90) part of chip STP2000 (Master I= /O), @@ -35,9 +36,6 @@ * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR53= C9X.txt */ =20 -#define ESP_ERROR(fmt, ...) = \ - do { printf("ESP ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } whi= le (0) - #define ESP_REGS 16 #define TI_BUFSZ 16 =20 @@ -503,7 +501,8 @@ static uint64_t esp_reg_read(ESPState *s, uint32_t sa= ddr) s->ti_size--; if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) =3D=3D 0) { /* Data out. */ - ESP_ERROR("PIO data read not implemented\n"); + qemu_log_mask(LOG_UNIMP, + "esp: PIO data read not implemented\n"); s->rregs[ESP_FIFO] =3D 0; } else { s->rregs[ESP_FIFO] =3D s->ti_buf[s->ti_rptr++]; @@ -543,7 +542,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr= , uint64_t val) if (s->do_cmd) { s->cmdbuf[s->cmdlen++] =3D val & 0xff; } else if (s->ti_size =3D=3D TI_BUFSZ - 1) { - ESP_ERROR("fifo overrun\n"); + trace_esp_error_fifo_overrun(); } else { s->ti_size++; s->ti_buf[s->ti_wptr++] =3D val & 0xff; @@ -631,7 +630,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr= , uint64_t val) esp_raise_irq(s); break; default: - ESP_ERROR("Unhandled ESP command (%2.2x)\n", (unsigned)val); + trace_esp_error_unhandled_command(val); break; } break; @@ -646,7 +645,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr= , uint64_t val) s->rregs[saddr] =3D val; break; default: - ESP_ERROR("invalid write of 0x%02x at [0x%x]\n", (unsigned)val, = saddr); + trace_esp_error_invalid_write(val, saddr); return; } s->wregs[saddr] =3D val; diff --git a/trace-events b/trace-events index 9b2e717..fa13aed 100644 --- a/trace-events +++ b/trace-events @@ -644,6 +644,9 @@ iscsi_aio_read16_cb(void *iscsi, int status, void *ac= b, int canceled) "iscsi %p iscsi_aio_readv(void *iscsi, int64_t sector_num, int nb_sectors, void *o= paque, void *acb) "iscsi %p sector_num %"PRId64" nb_sectors %d opaque %p = acb %p" =20 # hw/esp.c +esp_error_fifo_overrun(void) "FIFO overrun" +esp_error_unhandled_command(uint32_t val) "unhandled command (%2.2x)" +esp_error_invalid_write(uint32_t val, uint32_t addr) "invalid write of 0= x%02x at [0x%x]" esp_raise_irq(void) "Raise IRQ" esp_lower_irq(void) "Lower IRQ" esp_dma_enable(void) "Raise enable" --=20 1.7.10