| Message ID | 1442406595-14296-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 09/16/2015 06:29 AM, Paolo Bonzini wrote: > The following changes since commit 007e620a7576e4ce2ea6955541e87d8ae8ed32ae: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2015-09-14 18:51:09 +0100) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 54ac801d5d1d5618344f65132f0d707c8c620df4: > > Revert "rcu: init rcu_registry_lock after fork" (2015-09-16 14:27:59 +0200) > > ---------------------------------------------------------------- > * Linux header update and cleanup > * Support for HyperV crash report > * Cleanup of target-specific HMP commands > * Multiarch batch > * Checkpatch fix for Perl 5.22 > * NBD fix > * Revert incorrect commit 5243722376 Is it worth floating the revert to the top of the queue, to minimize the window of broken builds during a bisect? But I don't care strongly enough to need a v2; it's not a qemu build failure, and bisect with libvirt interaction is not done as frequently as bisect on qemu itself building.
On 16 September 2015 at 13:29, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 007e620a7576e4ce2ea6955541e87d8ae8ed32ae: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2015-09-14 18:51:09 +0100) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 54ac801d5d1d5618344f65132f0d707c8c620df4: > > Revert "rcu: init rcu_registry_lock after fork" (2015-09-16 14:27:59 +0200) > > ---------------------------------------------------------------- > * Linux header update and cleanup > * Support for HyperV crash report > * Cleanup of target-specific HMP commands > * Multiarch batch > * Checkpatch fix for Perl 5.22 > * NBD fix > * Revert incorrect commit 5243722376 Hi. I'm afraid this fails to build on my w32 config: CC i386-softmmu/arch_init.o In file included from /home/petmay01/linaro/qemu-for-merges/monitor.c:66: /home/petmay01/linaro/qemu-for-merges/include/monitor/monitor-common.h:35: error: redefinition of typedef ‘MonitorDef’ /home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:83: error: previous declaration of ‘MonitorDef’ was here thanks -- PMM
On 16/09/2015 17:08, Peter Maydell wrote: > On 16 September 2015 at 13:29, Paolo Bonzini <pbonzini@redhat.com> wrote: >> The following changes since commit 007e620a7576e4ce2ea6955541e87d8ae8ed32ae: >> >> Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2015-09-14 18:51:09 +0100) >> >> are available in the git repository at: >> >> git://github.com/bonzini/qemu.git tags/for-upstream >> >> for you to fetch changes up to 54ac801d5d1d5618344f65132f0d707c8c620df4: >> >> Revert "rcu: init rcu_registry_lock after fork" (2015-09-16 14:27:59 +0200) >> >> ---------------------------------------------------------------- >> * Linux header update and cleanup >> * Support for HyperV crash report >> * Cleanup of target-specific HMP commands >> * Multiarch batch >> * Checkpatch fix for Perl 5.22 >> * NBD fix >> * Revert incorrect commit 5243722376 > > Hi. I'm afraid this fails to build on my w32 config: > > CC i386-softmmu/arch_init.o > In file included from /home/petmay01/linaro/qemu-for-merges/monitor.c:66: > /home/petmay01/linaro/qemu-for-merges/include/monitor/monitor-common.h:35: > error: redefinition of typedef ‘MonitorDef’ > /home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:83: > error: previous declaration of ‘MonitorDef’ was here The usual problem with different compiler versions. :( Fixed up and resent. Paolo
The following changes since commit 007e620a7576e4ce2ea6955541e87d8ae8ed32ae: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2015-09-14 18:51:09 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 54ac801d5d1d5618344f65132f0d707c8c620df4: Revert "rcu: init rcu_registry_lock after fork" (2015-09-16 14:27:59 +0200) ---------------------------------------------------------------- * Linux header update and cleanup * Support for HyperV crash report * Cleanup of target-specific HMP commands * Multiarch batch * Checkpatch fix for Perl 5.22 * NBD fix * Revert incorrect commit 5243722376 ---------------------------------------------------------------- Andrey Smetanin (3): cpu: Add crash_occurred flag into CPUState kvm: Add kvm system event crash handler i386/kvm: Hyper-v crash msrs set/get'ers and migration Fam Zheng (1): checkpatch: Escape left braces in regex Markus Armbruster (1): qemu-char: Use g_new() & friends where that makes obvious sense Paolo Bonzini (5): pci: remove Link Training error from AER error list update Linux headers to 4.3-rc1 update-linux-headers: copy standard-headers files one by one target-i386: move asm-x86/hyperv.h to standard-headers Revert "rcu: init rcu_registry_lock after fork" Pavel Butsykin (4): hmp-commands-info: move info_cmds content out of monitor.c monitor: remove target-specific code from monitor.c hmp-commands.hx: fix end of table info monitor: added generation of documentation for hmp-commands-info.hx Peter Crosthwaite (9): cpu-exec: Migrate some generic fns to cpu-exec-common translate-all: Move tcg_handle_interrupt() to -common tcg: split tcg_op_defs to -common tcg: Move tci_tb_ptr to -common translate: move real_host_page setting to -common cputlb: move CPU_LOOP() for tlb_reset() to exec.c cputlb: Change tlb_set_dirty() arg to cpu include/exec: Move cputlb exec.c defs out monitor: uninclude cpu_ldst Wen Congyang (1): nbd: release exp->blk after all clients are closed .gitignore | 1 + Makefile | 10 +- Makefile.target | 8 +- backends/testdev.c | 4 +- cpu-exec-common.c | 81 ++ cpu-exec.c | 59 -- cputlb.c | 30 +- exec.c | 28 +- hmp-commands-info.hx | 749 +++++++++++++++ hmp-commands.hx | 120 --- hw/pci/pcie_aer.c | 4 - include/exec/cputlb.h | 16 - include/exec/exec-all.h | 18 + include/monitor/monitor-common.h | 45 + include/qemu/typedefs.h | 1 + include/qom/cpu.h | 2 + include/standard-headers/asm-x86/hyperv.h | 254 ++++++ include/standard-headers/linux/pci_regs.h | 381 ++++++-- include/standard-headers/linux/virtio_ring.h | 3 +- kvm-all.c | 6 + linux-headers/asm-x86/hyperv.h | 251 +----- linux-headers/asm-x86/kvm.h | 4 +- linux-headers/linux/kvm.h | 2 + monitor.c | 1250 +------------------------- nbd.c | 21 +- qemu-char.c | 22 +- qemu-doc.texi | 2 + qom/cpu.c | 1 + scripts/checkpatch.pl | 22 +- scripts/update-linux-headers.sh | 77 +- stubs/Makefile.objs | 1 + stubs/target-monitor-defs.c | 9 + target-i386/Makefile.objs | 2 +- target-i386/cpu-qom.h | 1 + target-i386/cpu.c | 1 + target-i386/cpu.h | 2 + target-i386/kvm.c | 34 +- target-i386/machine.c | 27 + target-i386/monitor.c | 494 ++++++++++ target-ppc/Makefile.objs | 2 +- target-ppc/monitor.c | 255 ++++++ target-sh4/Makefile.objs | 1 + target-sh4/monitor.c | 52 ++ target-sparc/Makefile.objs | 2 +- target-sparc/monitor.c | 158 ++++ target-xtensa/Makefile.objs | 1 + target-xtensa/monitor.c | 34 + tcg/tcg-common.c | 37 + tcg/tcg.c | 8 +- tcg/tci/tcg-target.c | 2 +- tci.c | 6 - translate-all.c | 32 - translate-common.c | 56 ++ util/rcu.c | 7 +- vl.c | 3 + 55 files changed, 2765 insertions(+), 1934 deletions(-) create mode 100644 cpu-exec-common.c create mode 100644 hmp-commands-info.hx create mode 100644 include/monitor/monitor-common.h create mode 100644 include/standard-headers/asm-x86/hyperv.h create mode 100644 stubs/target-monitor-defs.c create mode 100644 target-i386/monitor.c create mode 100644 target-ppc/monitor.c create mode 100644 target-sh4/monitor.c create mode 100644 target-sparc/monitor.c create mode 100644 target-xtensa/monitor.c create mode 100644 tcg/tcg-common.c create mode 100644 translate-common.c