Patchwork cmd646: fix build when DEBUG_IDE is enabled.

login
register
mail settings
Submitter Mark Cave-Ayland
Date June 28, 2013, 1:43 p.m.
Message ID <1372426996-24282-1-git-send-email-mark.cave-ayland@ilande.co.uk>
Download mbox | patch
Permalink /patch/255381/
State New
Headers show

Comments

Mark Cave-Ayland - June 28, 2013, 1:43 p.m.
Make sure we use the correct TARGET/PRI macros in the debug statements.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Kevin Wolf <kwolf@redhat.com>
---
 hw/ide/cmd646.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Andreas Färber - June 28, 2013, 1:52 p.m.
Am 28.06.2013 15:43, schrieb Mark Cave-Ayland:
> Make sure we use the correct TARGET/PRI macros in the debug statements.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Kevin Wolf <kwolf@redhat.com>
> ---
>  hw/ide/cmd646.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
> index a73eb9a..9916701 100644
> --- a/hw/ide/cmd646.c
> +++ b/hw/ide/cmd646.c
> @@ -154,7 +154,7 @@ static uint64_t bmdma_read(void *opaque, hwaddr addr,
>          break;
>      }
>  #ifdef DEBUG_IDE
> -    printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val);
> +    printf("bmdma: readb " TARGET_FMT_plx " : 0x%02x\n", addr, val);

To remain output-compatible you could use "0x%02" HWADDR_PRIx.
While touching it, "0x%02" PRIx32 would be consistent for uint32_t val.

Andreas

>  #endif
>      return val;
>  }
> @@ -170,7 +170,7 @@ static void bmdma_write(void *opaque, hwaddr addr,
>      }
>  
>  #ifdef DEBUG_IDE
> -    printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val);
> +    printf("bmdma: writeb " TARGET_FMT_plx " : 0x%" PRIx64 "\n", addr, val);
>  #endif
>      switch(addr & 3) {
>      case 0:
>
Kevin Wolf - June 28, 2013, 2:08 p.m.
Am 28.06.2013 um 15:43 hat Mark Cave-Ayland geschrieben:
> Make sure we use the correct TARGET/PRI macros in the debug statements.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Kevin Wolf <kwolf@redhat.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index a73eb9a..9916701 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -154,7 +154,7 @@  static uint64_t bmdma_read(void *opaque, hwaddr addr,
         break;
     }
 #ifdef DEBUG_IDE
-    printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val);
+    printf("bmdma: readb " TARGET_FMT_plx " : 0x%02x\n", addr, val);
 #endif
     return val;
 }
@@ -170,7 +170,7 @@  static void bmdma_write(void *opaque, hwaddr addr,
     }
 
 #ifdef DEBUG_IDE
-    printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val);
+    printf("bmdma: writeb " TARGET_FMT_plx " : 0x%" PRIx64 "\n", addr, val);
 #endif
     switch(addr & 3) {
     case 0: