From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRVnf-0002Kb-ML for qemu-devel@nongnu.org; Thu, 04 Feb 2016 21:07:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRVnb-0001rd-MG for qemu-devel@nongnu.org; Thu, 04 Feb 2016 21:07:07 -0500 Date: Fri, 5 Feb 2016 11:43:28 +1100 From: David Gibson Message-ID: <20160205004328.GA13489@voom.redhat.com> References: <20160204184057.GA6058@li141-249.members.linode.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MGYHOYXEY6WxJCY8" Content-Disposition: inline In-Reply-To: <20160204184057.GA6058@li141-249.members.linode.com> Subject: Re: [Qemu-devel] [PATCH] hw: fix some debug message format strings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alyssa Milburn Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf --MGYHOYXEY6WxJCY8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 04, 2016 at 06:40:57PM +0000, Alyssa Milburn wrote: > Signed-off-by: Alyssa Milburn 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(-) >=20 > 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 add= r, > =20 > addr =3D (addr >> s->it_shift) & (s->size - 1); > s->data[addr] =3D 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); > } > =20 > static uint64_t macio_nvram_readb(void *opaque, hwaddr addr, > @@ -60,7 +61,8 @@ static uint64_t macio_nvram_readb(void *opaque, hwaddr = addr, > =20 > addr =3D (addr >> s->it_shift) & (s->size - 1); > value =3D 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); > =20 > 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 =3D opaque; > PCIHostState *phb =3D 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 a= ddr, > val =3D 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; > } --=20 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 --MGYHOYXEY6WxJCY8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWs/AwAAoJEGw4ysog2bOSnWIQALcNMjFz7HuPyrGcM0wPV3/F BZmx301OHDBbQITrY8TY2MRAA2/JwmqS811kR3YtWoEqF3KUYvKOil+kBJ7CFVUS 9OBicdnEgOZmHGkGUOUct6VlPTpPlweGik9MCkz7eYFFhDs59DvjdjrxQASI+zUB HDvm3Tsvs5WGo8/bgmpWg6tvhXDLO0xk60NlXPMve6TSU8OyfraVJDhbknVH6+uV wHb1QkOLCCm+fh7FY3znS4f9wX5hpYmjrDGQKgN6naa0nNcElu+aroZ9XAGAjHs8 xw6KvbbOvck1llffxGMGJ9mJewLRzrfvpl9si7JyqPgyjB0Hy86Dp0Wb0CiVLSt5 TmiC6iJoZNhjMfLKqta8TkxRUaELpc074TrP/auVQGtLzeZPvH11vbzlX2/iCiyc hsDSY8KpTjfwqwGHVBPQXnppcpHTIw6LIql0ISPBNLzHT4pIbI0R2sPr5RdmbqvP pHCJWn99NyPdWZuCvRUh7W+0Q6qS/ylNLxqKydCQmEv1a4WmVEFiPVt9NO0XQ7u+ EcJI7aABjbEkCP2eDHnkpFsSp9A68A3YwGBO+ZgCf0z/XK4z4UyvpLmNJTUbAeau NyHHRiGuNY9iIswE7OWeh+UaBNBilXcr+8sdVEd6B1YBarEFukLfiFHeVUlV2PeV 89rdB8kAT5Y6g7KVDxoh =Yffd -----END PGP SIGNATURE----- --MGYHOYXEY6WxJCY8--