On Thu, Feb 04, 2016 at 06:40:57PM +0000, Alyssa Milburn wrote: > Signed-off-by: Alyssa Milburn <fuz...@fuzzie.org>
Applied to ppc-for-2.6, thanks.
> ---
> hw/nvram/mac_nvram.c | 6 ++++--
> hw/pci-host/uninorth.c | 4 ++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
> index 564ef93..1671f46 100644
> --- a/hw/nvram/mac_nvram.c
> +++ b/hw/nvram/mac_nvram.c
> @@ -49,7 +49,8 @@ static void macio_nvram_writeb(void *opaque, hwaddr addr,
>
> addr = (addr >> s->it_shift) & (s->size - 1);
> s->data[addr] = value;
> - NVR_DPRINTF("writeb addr %04" PHYS_PRIx " val %" PRIx64 "\n", addr,
> value);
> + NVR_DPRINTF("writeb addr %04" HWADDR_PRIx " val %" PRIx64 "\n",
> + addr, value);
> }
>
> static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
> @@ -60,7 +61,8 @@ static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
>
> addr = (addr >> s->it_shift) & (s->size - 1);
> value = s->data[addr];
> - NVR_DPRINTF("readb addr %04x val %x\n", (int)addr, value);
> + NVR_DPRINTF("readb addr %04" HWADDR_PRIx " val %" PRIx32 "\n",
> + addr, value);
>
> return value;
> }
> diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
> index 40a2e3e..15b1054 100644
> --- a/hw/pci-host/uninorth.c
> +++ b/hw/pci-host/uninorth.c
> @@ -120,7 +120,7 @@ static void unin_data_write(void *opaque, hwaddr addr,
> {
> UNINState *s = opaque;
> PCIHostState *phb = PCI_HOST_BRIDGE(s);
> - UNIN_DPRINTF("write addr %" TARGET_FMT_plx " len %d val %"PRIx64"\n",
> + UNIN_DPRINTF("write addr " TARGET_FMT_plx " len %d val %"PRIx64"\n",
> addr, len, val);
> pci_data_write(phb->bus,
> unin_get_config_reg(phb->config_reg, addr),
> @@ -137,7 +137,7 @@ static uint64_t unin_data_read(void *opaque, hwaddr addr,
> val = pci_data_read(phb->bus,
> unin_get_config_reg(phb->config_reg, addr),
> len);
> - UNIN_DPRINTF("read addr %" TARGET_FMT_plx " len %d val %x\n",
> + UNIN_DPRINTF("read addr " TARGET_FMT_plx " len %d val %x\n",
> addr, len, val);
> return val;
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
