From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 10 Sep 2015 09:24:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~203
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17;p=sdk%2Femulator%2Fqemu.git

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

virtio,pc,acpi fixes, cleanups

Fixes all over the place.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 10 Sep 2015 10:16:18 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  hw/pci: fix pci_update_mappings() trace events
  pc: memhotplug: keep reserved-memory-end broken on 2.4 and earlier machines
  pc: memhotplug: fix incorrectly set reserved-memory-end
  acpi: Remove unused definition.
  virtio: avoid leading underscores for helpers
  pc: Remove redundant arguments from xen_hvm_init()
  pci: Fix pci_device_iommu_address_space() bus propagation

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

fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17