[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/18] cadence_gem: Debug mode compile fixes
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 03/18] cadence_gem: Debug mode compile fixes |
Date: |
Wed, 30 Jan 2013 11:24:13 +0100 |
From: Peter Crosthwaite <address@hidden>
Some printfs are throwing warnings when debug mode is enabled. Fixed.
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/cadence_gem.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/hw/cadence_gem.c b/hw/cadence_gem.c
index 0d83442..b77423d 100644
--- a/hw/cadence_gem.c
+++ b/hw/cadence_gem.c
@@ -687,14 +687,15 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
packet_desc_addr = s->rx_desc_addr;
while (1) {
- DB_PRINT("read descriptor 0x%x\n", packet_desc_addr);
+ DB_PRINT("read descriptor 0x%x\n", (unsigned)packet_desc_addr);
/* read current descriptor */
cpu_physical_memory_read(packet_desc_addr,
(uint8_t *)&desc[0], sizeof(desc));
/* Descriptor owned by software ? */
if (rx_desc_get_ownership(desc) == 1) {
- DB_PRINT("descriptor 0x%x owned by sw.\n", packet_desc_addr);
+ DB_PRINT("descriptor 0x%x owned by sw.\n",
+ (unsigned)packet_desc_addr);
s->regs[GEM_RXSTATUS] |= GEM_RXSTATUS_NOBUF;
/* Handle interrupt consequences */
gem_update_int_status(s);
@@ -709,7 +710,7 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
*/
if (rx_desc_get_buffer(desc) == 0) {
DB_PRINT("Invalid RX buffer (NULL) for descriptor 0x%x\n",
- packet_desc_addr);
+ (unsigned)packet_desc_addr);
break;
}
@@ -749,7 +750,7 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
s->rx_desc_addr += 8;
}
- DB_PRINT("set SOF, OWN on descriptor 0x%08x\n", packet_desc_addr);
+ DB_PRINT("set SOF, OWN on descriptor 0x%08x\n",
(unsigned)packet_desc_addr);
/* Count it */
gem_receive_updatestats(s, buf, size);
@@ -861,7 +862,8 @@ static void gem_transmit(GemState *s)
*/
if ((tx_desc_get_buffer(desc) == 0) ||
(tx_desc_get_length(desc) == 0)) {
- DB_PRINT("Invalid TX descriptor @ 0x%x\n", packet_desc_addr);
+ DB_PRINT("Invalid TX descriptor @ 0x%x\n",
+ (unsigned)packet_desc_addr);
break;
}
@@ -1031,10 +1033,11 @@ static uint64_t gem_read(void *opaque, hwaddr offset,
unsigned size)
offset >>= 2;
retval = s->regs[offset];
- DB_PRINT("offset: 0x%04x read: 0x%08x\n", offset*4, retval);
+ DB_PRINT("offset: 0x%04x read: 0x%08x\n", (unsigned)offset*4, retval);
switch (offset) {
case GEM_ISR:
+ DB_PRINT("lowering irq on ISR read\n");
qemu_set_irq(s->irq, 0);
break;
case GEM_PHYMNTNC:
@@ -1073,7 +1076,7 @@ static void gem_write(void *opaque, hwaddr offset,
uint64_t val,
GemState *s = (GemState *)opaque;
uint32_t readonly;
- DB_PRINT("offset: 0x%04x write: 0x%08x ", offset, (unsigned)val);
+ DB_PRINT("offset: 0x%04x write: 0x%08x ", (unsigned)offset, (unsigned)val);
offset >>= 2;
/* Squash bits which are read only in write value */
--
1.8.1
- [Qemu-devel] [PULL 00/18] Trivial patches for 22 to 30 January 2013, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 1/4] hw: Spelling fix in log message, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 01/18] vnc: Clean up vncws_send_handshake_response(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 2/4] acpitable: open the data file in binary mode, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 03/18] cadence_gem: Debug mode compile fixes,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 02/18] cadence_ttc: Debug mode compile fixes, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 4/4] hw/tpci200: Fix compiler warning (redefined symbol with MinGW), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 3/4] configure: silence pkg-config's check for curses, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 04/18] xilinx_axidma: Fix debug mode compile messages, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 05/18] g_malloc(0) and g_malloc0(0) return NULL; simplify, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 10/18] virtfs-proxy-helper: Fix unchecked strdup() by conv. to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 09/18] spice: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 15/18] qemu-ga: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 13/18] libcacard: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 14/18] qapi: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30