From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 24 Mar 2016 21:42:12 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
X-Git-Tag: v2.6.0-rc0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84a5a8014801a83d1b8d15fa7f0fde03db081530;p=thirdparty%2Fqemu.git

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

* Log filtering from Alex and Peter
* Chardev fix from Marc-André
* config.status tweak from David
* Header file tweaks from Markus, myself and Veronia (Outreachy candidate)
* get_ticks_per_sec() removal from Rutuja (Outreachy candidate)
* Coverity fix from myself
* PKE implementation from myself, based on rth's XSAVE support

# gpg: Signature made Thu 24 Mar 2016 20:15:11 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream: (28 commits)
  target-i386: implement PKE for TCG
  config.status: Pass extra parameters
  char: translate from QIOChannel error to errno
  exec: fix error handling in file_ram_alloc
  cputlb: modernise the debug support
  qemu-log: support simple pid substitution for logs
  target-arm: dfilter support for in_asm
  qemu-log: dfilter-ise exec, out_asm, op and opt_op
  qemu-log: new option -dfilter to limit output
  qemu-log: Improve the "exec" TB execution logging
  qemu-log: Avoid function call for disabled qemu_log_mask logging
  qemu-log: correct help text for -d cpu
  tcg: pass down TranslationBlock to tcg_code_gen
  util: move declarations out of qemu-common.h
  Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND
  hw: explicitly include qemu-common.h and cpu.h
  include/crypto: Include qapi-types.h or qemu/bswap.h instead of qemu-common.h
  isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h
  Move ParallelIOArg from qemu-common.h to sysemu/char.h
  Move QEMU_ALIGN_*() from qemu-common.h to qemu/osdep.h
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Conflicts:
	scripts/clean-includes
---

84a5a8014801a83d1b8d15fa7f0fde03db081530
diff --cc hw/usb/dev-mtp.c
index ee2071f3d50,3e0bdc1bae1..bda84a64bdc
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@@ -14,8 -15,9 +15,9 @@@
  #include <dirent.h>
  
  #include <sys/statvfs.h>
 -#ifdef __linux__
 +#ifdef CONFIG_INOTIFY1
  #include <sys/inotify.h>
+ #include "qapi/error.h"
  #include "qemu/main-loop.h"
  #endif
  
diff --cc scripts/clean-includes
index fb2a49c3b8a,8052bbd3b43..72b47f17f97
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@@ -139,8 -139,8 +139,8 @@@ for f in "$@"; d
    # Remove includes that osdep.h already provides
    perl -n -i -e 'print if !/\s*#\s*include\s*(["<][^>"]*[">])/ ||
                            ! (grep { $_ eq $1 } qw (
-            "config-host.h" "qemu/compiler.h" "config.h"
+            "config-host.h" "config-target.h" "qemu/compiler.h"
 -           <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
 +           <setjmp.h> <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
             <stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h>
             <limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h>
             <sys/stat.h> <sys/time.h> <assert.h> <signal.h>
diff --cc util/oslib-posix.c
index 05c44ed4d24,09082564c43..20ca141dec1
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@@ -49,7 -50,9 +50,8 @@@
  #include "qemu/sockets.h"
  #include <sys/mman.h>
  #include <libgen.h>
 -#include <setjmp.h>
  #include <sys/signal.h>
+ #include "qemu/cutils.h"
  
  #ifdef CONFIG_LINUX
  #include <sys/syscall.h>