mbox

[PULL,00/19] Multithread, multiarch, multicompiler, multi^WKVM changes for 2015-07-06

Message ID 1436186108-29747-1-git-send-email-pbonzini@redhat.com
State New
Headers show

Pull-request

git://github.com/bonzini/qemu.git tags/for-upstream

Message

Paolo Bonzini July 6, 2015, 12:34 p.m. UTC
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 946e7bc4daddad21bd2f370c657dfb8b7209980e:

  exec: skip MMIO regions correctly in cpu_physical_memory_write_rom_internal (2015-07-06 14:30:21 +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 | 16 +++++++++
 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, 298 insertions(+), 73 deletions(-)
 create mode 100644 include/exec/tb-hash.h
 create mode 100644 include/qemu/fprintf-fn.h

Comments

Peter Maydell July 6, 2015, 1:02 p.m. UTC | #1
On 6 July 2015 at 13:35, Paolo Bonzini <pbonzini@redhat.com> wrote:
> From: Peter Maydell <peter.maydell@linaro.org>
> --- /dev/null
> +++ b/include/qemu/fprintf-fn.h
> @@ -0,0 +1,16 @@
> +/*
> + * Typedef for fprintf-alike function pointers.
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#ifndef FPRINTF_FN_H

Whoops. There should be a
#define FPRINTF_FN_H

here... (gcc doesn't complain about the redefinition of the typedef,
but clang does.)

> +
> +#include "qemu/compiler.h"
> +#include <stdio.h>
> +
> +typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
> +    GCC_FMT_ATTR(2, 3);
> +
> +#endif

thanks & apologies
-- PMM