Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* minor patches here and there
* MTTCG: lock-free TB lookup
* SCSI: bugfixes for MPTSAS, MegaSAS, LSI53c, vmw_pvscsi
* buffer_is_zero rewrite (except for one patch)
* chardev: qemu_chr_fe_write checks
* checkpatch improvement for markdown preformatted text
* default-configs cleanups
* atomics cleanups

# gpg: Signature made Tue 13 Sep 2016 18:14:30 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (58 commits)
  cutils: Add generic prefetch
  cutils: Add SSE4 version
  cutils: Add test for buffer_is_zero
  cutils: Remove ppc buffer zero checking
  cutils: Remove aarch64 buffer zero checking
  cutils: Rearrange buffer_is_zero acceleration
  cutils: Export only buffer_is_zero
  cutils: Remove SPLAT macro
  cutils: Move buffer_is_zero and subroutines to a new file
  ppc: do not redefine CPUPPCState
  x86/lapic: Load LAPIC state at post_load
  optionrom: do not rely on compiler's bswap optimization
  checkpatch: Fix whitespace checks for documentation code blocks
  atomics: Use __atomic_*_n() variant primitives
  atomics: Remove redundant barrier()'s
  kvm-all: drop kvm_setup_guest_memory
  i8257: Make device "i8257" unavailable with -device
  Revert "megasas: remove useless check for cmd->frame"
  char: convert qemu_chr_fe_write to qemu_chr_fe_write_all
  hw: replace most use of qemu_chr_fe_write with qemu_chr_fe_write_all
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
 Conflicts:
	cpus.c
	tests/Makefile.include

diff --cc MAINTAINERS
Simple merge

diff --cc blockdev.c
Simple merge

diff --cc configure
Simple merge

diff --cc cpus.c
index 0ab4ab1,0308431..e39ccb7
--- 1/cpus.c
--- 2/cpus.c
+++ b/cpus.c
@@@ -219,17 -223,18 +223,19 @@@ int64_t cpu_get_ticks(void
  
  static int64_t cpu_get_clock_locked(void)
  {
-     int64_t ticks;
+     int64_t time;
  
-     ticks = timers_state.cpu_clock_offset;
+     time = timers_state.cpu_clock_offset;
      if (timers_state.cpu_ticks_enabled) {
-         ticks += get_clock();
+         time += get_clock();
      }
  
-     return ticks;
+     return time;
  }
  
- /* return the host CPU monotonic time */
+ /* Return the monotonic time elapsed in VM, i.e.,
 - * the time between vm_start and vm_stop */
++ * the time between vm_start and vm_stop
++ */
  int64_t cpu_get_clock(void)
  {
      int64_t ti;

diff --cc include/qemu/timer.h
Simple merge

diff --cc qemu-options.hx
Simple merge

diff --cc tests/Makefile.include
index e560ecb,bde274d..2f11064
--- 1/tests/Makefile.include
--- 2/tests/Makefile.include
+++ b/tests/Makefile.include
@@@ -112,7 -112,8 +112,9 @@@ check-unit-y += tests/test-crypto-xts$(
  check-unit-y += tests/test-crypto-block$(EXESUF)
  gcov-files-test-logging-y = tests/test-logging.c
  check-unit-y += tests/test-logging$(EXESUF)
 +check-unit-$(CONFIG_REPLICATION) += tests/test-replication$(EXESUF)
+ check-unit-y += tests/test-bufferiszero$(EXESUF)
+ gcov-files-check-bufferiszero-y = util/bufferiszero.c
  
  check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh