From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 14 Jul 2014 16:01:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~309
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0a9934eef166836c8100fce72f7f837cb8b2ed2b;p=qemu-upstream-4.6-testing.git

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

Misc 2.1 fixes regarding character/serial devices and SCSI.

# gpg: Signature made Mon 14 Jul 2014 16:26:08 BST using RSA key ID 9B4D86F2
# gpg: Can't check signature: public key not found

* remotes/bonzini/tags/for-upstream:
  serial-pci: remove memory regions from BAR before destroying them
  virtio-scsi: fix with -M pc-i440fx-2.0
  serial: change retry logic to avoid concurrency
  qemu-char: fix deadlock with "-monitor pty"
  scsi: Report error when lun number is in use

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

0a9934eef166836c8100fce72f7f837cb8b2ed2b