| Message ID | 1436187643-31825-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 6 July 2015 at 14:00, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 0a4a0312bf8b029cbd32a97db2cad669cf65ac49: > > Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging (2015-06-25 14:03:55 +0100) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to b242e0e0e2969c044a318e56f7988bbd84de1f63: > > exec: skip MMIO regions correctly in cpu_physical_memory_write_rom_internal (2015-07-06 14:59:11 +0200) > > ---------------------------------------------------------------- > * more of Peter Crosthwaite's multiarch preparation patches > * unlocked MMIO support in KVM > * support for compilation with ICC Applied, thanks. -- PMM
diff --git a/include/qemu/fprintf-fn.h b/include/qemu/fprintf-fn.h index 4f66d45..9ddc90f 100644 --- a/include/qemu/fprintf-fn.h +++ b/include/qemu/fprintf-fn.h @@ -5,7 +5,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef FPRINTF_FN_H +#ifndef QEMU_FPRINTF_FN_H +#define QEMU_FPRINTF_FN_H 1 #include "qemu/compiler.h" #include <stdio.h>
The following changes since commit 0a4a0312bf8b029cbd32a97db2cad669cf65ac49: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging (2015-06-25 14:03:55 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to b242e0e0e2969c044a318e56f7988bbd84de1f63: exec: skip MMIO regions correctly in cpu_physical_memory_write_rom_internal (2015-07-06 14:59:11 +0200) ---------------------------------------------------------------- * more of Peter Crosthwaite's multiarch preparation patches * unlocked MMIO support in KVM * support for compilation with ICC ---------------------------------------------------------------- Artyom Tarasenko (2): qemu-common: add VEC_OR macro cutils: allow compilation with icc Jan Kiszka (4): memory: Add global-locking property to memory regions memory: let address_space_rw/ld*/st* run outside the BQL kvm: First step to push iothread lock out of inner run loop kvm: Switch to unlocked PIO Paolo Bonzini (6): main-loop: use qemu_mutex_lock_iothread consistently main-loop: introduce qemu_mutex_iothread_locked exec: pull qemu_flush_coalesced_mmio_buffer() into address_space_rw/ld*/st* acpi: mark PMTIMER as unlocked kvm: Switch to unlocked MMIO exec: skip MMIO regions correctly in cpu_physical_memory_write_rom_internal Peter Crosthwaite (5): memory_mapping: Rework cpu related includes cpu-defs: Move CPU_TEMP_BUF_NLONGS to tcg include/exec: Move standard exceptions to cpu-all.h include/exec: Move tb hash functions out cpu-defs: Move out TB_JMP defines Peter Maydell (1): Stop including qemu-common.h in memory.h 马文霜 (1): Fix irq route entries exceeding KVM_MAX_IRQ_ROUTES cpu-exec.c | 1 + cpus.c | 19 +++++++++-- exec.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++- hw/acpi/core.c | 1 + include/exec/cpu-all.h | 6 ++++ include/exec/cpu-common.h | 2 ++ include/exec/cpu-defs.h | 15 --------- include/exec/exec-all.h | 20 ------------ include/exec/memory.h | 27 ++++++++++++++- include/exec/tb-hash.h | 51 +++++++++++++++++++++++++++++ include/hw/arm/arm.h | 1 + include/qemu-common.h | 7 ++-- include/qemu/fprintf-fn.h | 17 ++++++++++ include/qemu/main-loop.h | 10 ++++++ kvm-all.c | 25 +++++++++----- memory.c | 23 +++++++------ memory_mapping.c | 2 +- stubs/iothread-lock.c | 5 +++ target-i386/kvm.c | 24 ++++++++++++++ target-mips/kvm.c | 4 +++ target-ppc/kvm.c | 7 ++++ target-s390x/kvm.c | 3 ++ target-s390x/mmu_helper.c | 2 +- tcg/tcg.h | 2 ++ translate-all.c | 1 + util/cutils.c | 14 ++++---- 26 files changed, 299 insertions(+), 73 deletions(-) create mode 100644 include/exec/tb-hash.h create mode 100644 include/qemu/fprintf-fn.h v1->v2 diff: