Patchwork ide: fix compilation errors when DEBUG_IDE is set

login
register
mail settings
Submitter Hervé Poussineau
Date Feb. 6, 2012, 9:19 p.m.
Message ID <1328563183-2823-1-git-send-email-hpoussin@reactos.org>
Download mbox | patch
Permalink /patch/139800/
State New
Headers show

Comments

Hervé Poussineau - Feb. 6, 2012, 9:19 p.m.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/ide/pci.c  |    2 +-
 hw/ide/piix.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Stefan Hajnoczi - Feb. 9, 2012, 8:44 a.m.
On Mon, Feb 06, 2012 at 10:19:42PM +0100, Hervé Poussineau wrote:
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/ide/pci.c  |    2 +-
>  hw/ide/piix.c |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)

The types in this code are a mess but your patch doesn't make it worse.
It would be nice to clean things up in the future.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 246dd57..88c0942 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -336,7 +336,7 @@  static uint64_t bmdma_addr_read(void *opaque, target_phys_addr_t addr,
 
     data = (bm->addr >> (addr * 8)) & mask;
 #ifdef DEBUG_IDE
-    printf("%s: 0x%08x\n", __func__, (unsigned)*data);
+    printf("%s: 0x%08x\n", __func__, (unsigned)data);
 #endif
     return data;
 }
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index bf4465b..76cf209 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -53,7 +53,7 @@  static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, unsigned size)
         break;
     }
 #ifdef DEBUG_IDE
-    printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val);
+    printf("bmdma: readb 0x%02x : 0x%02x\n", (uint8_t)addr, val);
 #endif
     return val;
 }
@@ -68,7 +68,7 @@  static void bmdma_write(void *opaque, target_phys_addr_t addr,
     }
 
 #ifdef DEBUG_IDE
-    printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val);
+    printf("bmdma: writeb 0x%02x : 0x%02x\n", (uint8_t)addr, (uint8_t)val);
 #endif
     switch(addr & 3) {
     case 0: