Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, pc: fixes and features

nvdimm hotplug support
virtio migration and ioeventfd rework
virtio crypto device
ipmi fixes

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 01 Nov 2016 05:23:40 PM GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream: (47 commits)
  acpi: fix assert failure caused by commit 35c5a52d
  acpi/ipmi: Initialize the fwinfo before fetching it
  ipmi: Add graceful shutdown handling to the external BMC
  ipmi: fix build config variable name for ipmi_bmc_extern.o
  ipmi: Implement shutdown via ACPI overtemp
  ipmi: chassis poweroff should use qemu_system_shutdown_request()
  ipmi_bmc_sim: Remove an unnecessary mutex
  ipmi: Remove hotplug from IPMI BMCs
  pc: memhp: enable nvdimm device hotplug
  nvdimm acpi: introduce _FIT
  nvdimm acpi: introduce fit buffer
  nvdimm acpi: prebuild nvdimm devices for available slots
  nvdimm acpi: use common macros instead of magic names
  acpi nvdimm: rename result_size to dsm_out_buf_siz
  nvdimm acpi: compile nvdimm acpi code arch-independently
  acpi nvdimm: fix Arg6 usage
  acpi nvdimm: fix ARG3 conflict
  acpi nvdimm: fix device physical address base
  acpi nvdimm: fix OperationRegion definition
  acpi nvdimm: fix wrong buffer size returned by DSM method
  ...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc hw/i386/acpi-build.c
Simple merge

diff --cc hw/scsi/virtio-scsi-dataplane.c
index 9424f0e05752bb0e14a7d242281501dfa542b7a3,aa6be541ec464bbcbc8281f2563c96aea5622245..f2ea29dbc340c936bd2653668c4f0513cdb06d75
--- 1/hw/scsi/virtio-scsi-dataplane.c
--- 2/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@@ -186,11 -199,10 +199,10 @@@ void virtio_scsi_dataplane_stop(VirtIOD
          return;
      }
      s->dataplane_stopping = true;
-     assert(s->ctx == iothread_get_aio_context(vs->conf.iothread));
  
      aio_context_acquire(s->ctx);
 -
      virtio_scsi_clear_aio(s);
 +    aio_context_release(s->ctx);
  
      blk_drain_all(); /* ensure there are no in-flight requests */
  

diff --cc qemu-options.hx
Simple merge

diff --cc tests/ipmi-bt-test.c
Simple merge