From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 25 Feb 2016 15:30:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=586fc27e6a2ade22e35089e8972bc678b113e1db;p=qemu.git

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

* Asynchronous dump-guest-memory from Peter
* improved logging with -D -daemonize from Dimitris
* more address_space_* optimization from Gonglei
* TCG xsave/xrstor thinko fix
* chardev bugfix and documentation patch

# gpg: Signature made Thu 25 Feb 2016 15:12:27 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:
  target-i386: fix confusion in xcr0 bit position vs. mask
  chardev: Properly initialize ChardevCommon components
  memory: Remove unreachable return statement
  memory: optimize qemu_get_ram_ptr and qemu_ram_ptr_length
  exec: store RAMBlock pointer into memory region
  log: Redirect stderr to logfile if deamonized
  dump-guest-memory: add qmp event DUMP_COMPLETED
  Dump: add hmp command "info dump"
  Dump: add qmp command "query-dump"
  DumpState: adding total_size and written_size fields
  dump-guest-memory: add "detach" support
  dump-guest-memory: disable dump when in INMIGRATE state
  dump-guest-memory: introduce dump_process() helper function.
  dump-guest-memory: add dump_in_progress() helper function
  dump-guest-memory: using static DumpState, add DumpStatus
  dump-guest-memory: add "detach" flag for QMP/HMP interfaces.
  dump-guest-memory: cleanup: removing dump_{error|cleanup}().
  scripts/kvm/kvm_stat: Fix missing right parantheses and ".format(...)"
  qemu-options.hx: Improve documentation of chardev multiplexing mode

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

586fc27e6a2ade22e35089e8972bc678b113e1db
diff --cc include/exec/memory.h
index d5f2b2ce6f,032400aefa..d5284c2435
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@@ -29,8 -31,10 +29,9 @@@
  #include "qemu/queue.h"
  #include "qemu/int128.h"
  #include "qemu/notify.h"
 -#include "qapi/error.h"
  #include "qom/object.h"
  #include "qemu/rcu.h"
+ #include "qemu/typedefs.h"
  
  #define MAX_PHYS_ADDR_SPACE_BITS 62
  #define MAX_PHYS_ADDR            (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)