From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 10 Mar 2014 19:14:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~134
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=118760dfc9f4db2df3700ddb2934543abef86bfa;p=qemu-xen.git

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

acpi,pc,pci,virtio,memory bug fixes

This collects several small fixes from all over the place.
Additionally, Marcel's changes make acpi unit tests more robust.

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

# gpg: Signature made Sun 09 Mar 2014 19:14:57 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:
  qemu: x86: ignore ioapic polarity
  pckbd: return 'keyboard enabled' on read input port command
  pam: partly fix write-only mode
  acpi-test: issue errors instead of warnings when possible
  acpi-test: retain both asl and aml files on failure
  MAINTAINERS: drop an out of date address
  Add a 'name' parameter to qemu_thread_create
  Add 'debug-threads' suboption to --name
  Rework --name to use QemuOpts
  PCIE: fix regression with coldplugged multifunction device
  memory_region_present: return false if address is not found in child MemoryRegion
  virtio-net: remove function calls from assert
  acpi-test-data: update expected files
  acpi-build: append description for non-hotplug

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

118760dfc9f4db2df3700ddb2934543abef86bfa
diff --cc MAINTAINERS
index 9bd307fb10,62e76833da..7d17f83868
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -181,10 -178,8 +180,9 @@@ M: Cornelia Huck <cornelia.huck@de.ibm.
  M: Alexander Graf <agraf@suse.de>
  S: Maintained
  F: target-s390x/kvm.c
 +F: hw/intc/s390_flic.[hc]
  
  X86
- M: Gleb Natapov <gleb@redhat.com>
  M: Marcelo Tosatti <mtosatti@redhat.com>
  L: kvm@vger.kernel.org
  S: Supported