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

misc fixes and cleanups

A bunch of fixes all over the place, some of the
bugs fixed are actually regressions.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed Mar 11 17:48:30 2015 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# 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: (25 commits)
  virtio-scsi: remove empty wrapper for cmd
  virtio-scsi: clean out duplicate cdb field
  virtio-scsi: fix cdb/sense size
  uapi/virtio_scsi: allow overriding CDB/SENSE size
  virtio-scsi: drop duplicate CDB/SENSE SIZE
  exec: don't include hw/boards for linux-user
  acpi: specify format for build_append_namestring
  MAINTAINERS: drop aliguori@amazon.com
  tpm: Move memory subregion function into realize function
  virtio-pci: Convert to realize()
  pci: Convert pci_nic_init() to Error to avoid qdev_init()
  machine: query mem-merge machine property
  machine: query dump-guest-core machine property
  hw/boards: make it safe to include for linux-user
  machine: query phandle-start machine property
  machine: query kvm-shadow-mem machine property
  kvm: add machine state to kvm_arch_init
  machine: query kernel-irqchip property
  machine: allowed/required kernel-irqchip support
  machine: replace qemu opts with iommu property
  ...

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

diff --cc MAINTAINERS
index e857cf8bf3c6e377adb752bd6af6ad37666809bc,50343e9a7ae211931ab001923140117bd826b60b..d7e9ba2da75f32960b322be84de2837ec148196e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -787,20 -766,7 +783,19 @@@ F: tests/qemu-iotests
  T: git git://repo.or.cz/qemu/kevin.git block
  T: git git://github.com/stefanha/qemu.git block
  
 +Block Jobs
 +M: Jeff Cody <jcody@redhat.com>
 +L: qemu-block@nongnu.org
 +S: Supported
 +F: blockjob.c
 +F: include/block/blockjob.h
 +F: block/backup.c
 +F: block/commit.c
 +F: block/stream.h
 +F: block/mirror.c
 +T: git git://github.com/codyprime/qemu-kvm-jtc.git block
 +
  Character Devices
- M: Anthony Liguori <aliguori@amazon.com>
  M: Paolo Bonzini <pbonzini@redhat.com>
  S: Maintained
  F: qemu-char.c

diff --cc exec.c
Simple merge

diff --cc target-i386/kvm.c
Simple merge

diff --cc target-s390x/kvm.c
Simple merge