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

* chardev support for TLS and leak fix
* NBD fix from Denis
* condvar fix from Dave
* kvm_stat and dump-guest-memory almost rewrite
* mem-prealloc fix from Luiz
* manpage style improvement

# gpg: Signature made Tue 26 Jan 2016 14:58:18 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: (49 commits)
  scripts/dump-guest-memory.py: Fix module docstring
  scripts/dump-guest-memory.py: Introduce multi-arch support
  scripts/dump-guest-memory.py: Cleanup functions
  scripts/dump-guest-memory.py: Improve python 3 compatibility
  scripts/dump-guest-memory.py: Make methods functions
  scripts/dump-guest-memory.py: Move constants to the top
  nbd: add missed aio_context_acquire in nbd_export_new
  memory: exit when hugepage allocation fails if mem-prealloc
  cpus: use broadcast on qemu_pause_cond
  scripts/kvm/kvm_stat: Add optparse description
  scripts/kvm/kvm_stat: Add interactive filtering
  scripts/kvm/kvm_stat: Fixup filtering
  scripts/kvm/kvm_stat: Fix rlimit for unprivileged users
  scripts/kvm/kvm_stat: Read event values as u64
  scripts/kvm/kvm_stat: Cleanup and pre-init perf_event_attr
  scripts/kvm/kvm_stat: Fix output formatting
  scripts/kvm/kvm_stat: Make tui function a class
  scripts/kvm/kvm_stat: Remove unneeded X86_EXIT_REASONS
  scripts/kvm/kvm_stat: Group arch specific data
  scripts/kvm/kvm_stat: Cleanup of Event class
  ...

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

diff --cc cpus.c
Simple merge

diff --cc nbd/server.c
index 2265cb0680f0ce6bde148786d2721baf9b444959,3596e68191a7b3052ec87f128d9388ec321792ee..256feafcece51b3e89f633da715473af4b7f0968
--- 1/nbd/server.c
--- 2/nbd/server.c
+++ b/nbd/server.c
@@@ -668,10 -668,12 +668,12 @@@ NBDExport *nbd_export_new(BlockBackend 
      blk_add_aio_context_notifier(blk, blk_aio_attached, blk_aio_detach, exp);
      /*
       * NBD exports are used for non-shared storage migration.  Make sure
 -     * that BDRV_O_INCOMING is cleared and the image is ready for write
 +     * that BDRV_O_INACTIVE is cleared and the image is ready for write
       * access since the export could be available before migration handover.
       */
+     aio_context_acquire(exp->ctx);
      blk_invalidate_cache(blk, NULL);
+     aio_context_release(exp->ctx);
      return exp;
  
  fail: