On Mon, Sep 21, 2015 at 02:33:12PM -0700, Peter Maydell wrote: > On 20 September 2015 at 18:05, David Gibson <da...@gibson.dropbear.id.au> > wrote: > > The following changes since commit 18640989a9f5e4d2e84b566c52ff1fccfa0dbf4a: > > > > Merge remote-tracking branch > > 'remotes/afaerber/tags/qom-devices-for-peter' into staging (2015-09-19 > > 15:59:52 +0100) > > > > are available in the git repository at: > > > > git://github.com/dgibson/qemu.git spapr-next-20150921 > > > > for you to fetch changes up to 5576a6644cb302ac5b715205e7b4f157f116b9de: > > > > ppc/spapr: Fix buffer overflow in spapr_populate_drconf_memory() > > (2015-09-21 10:35:42 +1000) > > > > ---------------------------------------------------------------- > > sPAPR Patch Queue: 2015-09-21 > > > > Highlights: > > * Memory hotplug for "pseries" guests > > * Fixes to the PAPR Dynamic Reconfiguration hotplug code > > * Several PAPR compliance fixes > > * New SLOF with: > > * GPT support > > * Much faster VGA handling > > Hi. I'm afraid this fails 'make check': > > qemu-system-ppc64: > /home/petmay01/linaro/qemu-for-merges/hw/core/machine.c:324: > machine_class_base_init: Assertion `g_str_has_suffix(cname, > "-machine")' failed.
Sod, sorry. Right after I sent it I realised that I hadn't updated the 2.5 machine type (added in that pull) for the stuff requiring "-machine" in the type names. I hadn't realised it broke things so badly though, because I thought Travis CI would catch a make check failure for me. Seems not though :(. I'll fix this up and send a new pull shortly. -- 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
pgpIhDhd5WHKT.pgp
Description: PGP signature