[Qemu-commits] [COMMIT a8b7063] Avoid a gcc 3 format warning

[Anthony Liguori]

From: Blue Swirl <address@hidden>

Signed-off-by: Blue Swirl <address@hidden>

diff --git a/hw/spitz.c b/hw/spitz.c
index b0d42ad..bfab06a 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -24,11 +24,7 @@
 #include "boards.h"
 
 #undef REG_FMT
-#if TARGET_PHYS_ADDR_BITS == 32
-#define REG_FMT                        "0x%02x"
-#else
 #define REG_FMT                        "0x%02lx"
-#endif
 
 /* Spitz Flash */
 #define FLASH_BASE             0x0c000000
@@ -87,7 +83,7 @@ static uint32_t sl_readb(void *opaque, target_phys_addr_t 
addr)
         return ecc_digest(&s->ecc, nand_getio(s->nand));
 
     default:
-        zaurus_printf("Bad register offset " REG_FMT "\n", addr);
+        zaurus_printf("Bad register offset " REG_FMT "\n", (unsigned 
long)addr);
     }
     return 0;
 }
@@ -129,7 +125,7 @@ static void sl_writeb(void *opaque, target_phys_addr_t addr,
         break;
 
     default:
-        zaurus_printf("Bad register offset " REG_FMT "\n", addr);
+        zaurus_printf("Bad register offset " REG_FMT "\n", (unsigned 
long)addr);
     }
 }
 
diff --git a/hw/zaurus.c b/hw/zaurus.c
index 56e150d..7cf47b9 100644
--- a/hw/zaurus.c
+++ b/hw/zaurus.c
@@ -21,11 +21,7 @@
 #include "sharpsl.h"
 
 #undef REG_FMT
-#if TARGET_PHYS_ADDR_BITS == 32
-#define REG_FMT                        "0x%02x"
-#else
 #define REG_FMT                        "0x%02lx"
-#endif
 
 /* SCOOP devices */
 
@@ -98,7 +94,7 @@ static uint32_t scoop_readb(void *opaque, target_phys_addr_t 
addr)
     case SCOOP_GPRR:
         return s->gpio_level;
     default:
-        zaurus_printf("Bad register offset " REG_FMT "\n", addr);
+        zaurus_printf("Bad register offset " REG_FMT "\n", (unsigned 
long)addr);
     }
 
     return 0;
@@ -143,7 +139,7 @@ static void scoop_writeb(void *opaque, target_phys_addr_t 
addr, uint32_t value)
         scoop_gpio_handler_update(s);
         break;
     default:
-        zaurus_printf("Bad register offset " REG_FMT "\n", addr);
+        zaurus_printf("Bad register offset " REG_FMT "\n", (unsigned 
long)addr);
     }
 }