On Mon, Jan 25, 2016 at 10:42:40AM +0000, Peter Maydell wrote:
> On 25 January 2016 at 01:14, David Gibson <david@gibson.dropbear.id.au> wrote:
> > The following changes since commit 047e363b05679724d6b784c6ec6310697fe48ba0:
> >
> >   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-softfloat-20160122' into staging (2016-01-22 15:19:21 +0000)
> >
> > are available in the git repository at:
> >
> >   git://github.com/dgibson/qemu.git tags/ppc-for-2.6-20160125
> >
> > for you to fetch changes up to ce3b7990c1ddf70b29f00eb878bb693471f9bc36:
> >
> >   uninorth.c: add support for UniNorth kMacRISCPCIAddressSelect (0x48) register (2016-01-25 10:35:50 +1100)
> >
> > ----------------------------------------------------------------
> > ppc patch queue for 2016-01-25
> >
> > Currently accumulated patches for target-ppc, pseries machine type and
> > related devices.
> >     * Cleanup of error handling code in spapr
> >     * A number of fixes for Macintosh devices for the benefit of MacOS 9 and X
> >     * Remove some abuses of the RTAS memory access functions in spapr
> >     * Fixes for the gdbstub (and monitor debug) for VMX and VSX extensions.
> >     * Fix pseries machine hotplug memory under TCG
> 
> Fails to build on 32-bit I'm afraid:
> 
> /home/petmay01/qemu/hw/ppc/spapr.c: In function 'spapr_validate_node_memory':
> /home/petmay01/qemu/hw/ppc/spapr.c:1723:13: error: format '%x' expects
> argument of type 'unsigned int', but argument 7 has type 'uint64_t'
> [-Werror=format]
>              error_setg(errp,
>              ^
> 
> Same thing from OSX clang, which gets the location of the error a bit
> more precise:
> 
> /Users/pm215/src/qemu-for-merges/hw/ppc/spapr.c:1726:27: warning:
> format specifies type 'unsigned long' but the argument has type
> 'uint64_t' (aka 'unsigned long long') [-Wformat]
>                        i, numa_info[i].node_mem,
>                           ^~~~~~~~~~~~~~~~~~~~~
> /Users/pm215/src/qemu-for-merges/include/qapi/error.h:168:35: note:
> expanded from macro 'error_setg'
>                         (fmt), ## __VA_ARGS__)

Ah, sorry, thanks for the info.

I think I've fixed it, but it's a bit hard to tell since for me
origin/master also fails to compile on 32-bit :(.

-- 
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