Peter Maydell <peter.mayd...@linaro.org> writes: > On 7 September 2016 at 11:28, David Gibson <da...@gibson.dropbear.id.au> > wrote: >> The following changes since commit 2926375cffce464fde6b4dabaed1e133d549af39: >> >> Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into >> staging (2016-09-06 17:18:17 +0100) >> >> are available in the git repository at: >> >> git://github.com/dgibson/qemu.git tags/ppc-for-2.8-20160907 >> >> for you to fetch changes up to d2ab58ffc927c00e88f53f9b853b015a76fa1bd2: >> >> tests: Check serial output of firmware boot of some machines (2016-09-07 >> 12:40:13 +1000) >> >> ---------------------------------------------------------------- >> ppc patch queue for 2016-Sep-7 >> >> This is my first pull request for the newly opened qemu-2.8 tree. It >> contains a heap of things that were too late for 2.7 and have been >> queued for a while. In particular: >> * A number of preliminary patches for the powernv machine type >> * A substantial cleanup of exception handling which will be >> necessary to support running a TCG with hypervisor >> facilities >> * A start on support for POWER9 >> * Some TCG implementations for new POWER9 instructions >> * Some TCG and related cleanups in preparation for POWER9 >> * Some assorted TCG optimizations >> * An implementation of the H_CHANGE_LOGICAL_LAN_MAC hypercall >> which allows the MAC address to be changed on the PAPR virtual >> NIC. >> * Add some extra test cases for several machines (this isn't >> strictly in the ppc code, but is most value to ppc) >> >> NOTE: This pull request supersedes ppc-for-2.8-20160906, which had >> some problems. Changes: >> * Dropped BenH's lmw/stmw speedups, which break for >> qemu-system-ppc64 on BE hosts >> * A small fix to Thomas' serial output test to avoid a warning on >> the isapc machine type. >> * Some trivial checkpatch fixes >> >> Note that some of the patches in this series still have large numbers >> of checkpatch warnings. This is because they're moving existing code >> that predates most of the checkpatch style conventions. >> > > Applied, thanks.
For reference this has broken 32 bit x86 builds on CentOS6. I bisected the problem to: commit 3654fa95bc29e72c2eef22f26eb621af1f86feec Author: Cédric Le Goater <c...@kaod.org> Date: Tue Aug 2 19:38:01 2016 +0200 hw/ppc: add a ppc_create_page_sizes_prop() helper routine The exact same routine will be used in PowerNV. Signed-off-by: Cédric Le Goater <c...@kaod.org> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> With: 15:00 alex@centos6-x86/i686 [qemu.git/bisect:???] >make CC ppc-softmmu/hw/ppc/fdt.o In file included from /home/alex/lsrc/qemu.git/hw/ppc/fdt.c:14: /home/alex/lsrc/qemu.git/include/hw/ppc/fdt.h:15: error: redefinition of typedef ‘CPUPPCState’ /home/alex/lsrc/qemu.git/target-ppc/cpu-qom.h:41: note: previous declaration of ‘CPUPPCState’ was here make[1]: *** [hw/ppc/fdt.o] Error 1 make: *** [subdir-ppc-softmmu] Error 2 15:00 alex@centos6-x86/i686 [qemu.git/bisect:???] > -- Alex Bennée