On 9 July 2015 at 16:22, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 9 July 2015 at 14:23, Andreas Färber <afaer...@suse.de> wrote: >> Hello Peter, >> >> This is my QOM CPU patch queue. Please pull. >> >> v3 fixes ppc and linux-user related bugs. >> >> Regards, >> Andreas >> >> Cc: Peter Maydell <peter.mayd...@linaro.org> >> >> Cc: Eduardo Habkost <ehabk...@redhat.com> >> Cc: Peter Crosthwaite <peter.crosthwa...@xilinx.com> >> >> The following changes since commit acf7b7fdf31fa76b53803790917c8acf23a2badb: >> >> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into >> staging (2015-07-08 20:46:35 +0100) >> >> are available in the git repository at: >> >> git://github.com/afaerber/qemu-cpu.git tags/qom-cpu-for-peter >> >> for you to fetch changes up to 6b625fde5eb8d1c969969392f1c92b58beed2183: >> >> disas: cris: QOMify target specific disas setup (2015-07-09 15:20:41 +0200) >> >> ---------------------------------------------------------------- >> QOM CPUState and X86CPU >> >> * Further QOM'ification of CPU initialization >> * Propagation of CPUState arguments and elimination of ENV_GET_CPU() usage >> * cpu_set_pc() abstraction >> * CPUClass::disas_set_info() hook >> > > Applied, thanks.
...but it turns out to have broken compiling TCI: CC x86_64-softmmu/arch_init.o In file included from /home/petmay01/linaro/qemu-for-merges/target-i386/cpu-qom.h:23:0, from /home/petmay01/linaro/qemu-for-merges/target-i386/cpu.h:986, from /home/petmay01/linaro/qemu-for-merges/include/qemu-common.h:122, from /home/petmay01/linaro/qemu-for-merges/include/disas/bfd.h:12, from /home/petmay01/linaro/qemu-for-merges/disas/tci.c:20: /home/petmay01/linaro/qemu-for-merges/include/qom/cpu.h:178:43: error: unknown type name ‘disassemble_info’ void (*disas_set_info)(CPUState *cpu, disassemble_info *info); ^ /home/petmay01/linaro/qemu-for-merges/include/qom/cpu.h:179:1: error: no semicolon at end of struct or union [-Werror] } CPUClass; ^ cc1: all warnings being treated as errors Maybe I should put that config in my standard build test set... -- PMM