diff options
| author | Peter Maydell | 2014-07-14 18:01:45 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-07-14 18:01:45 +0200 |
| commit | 0a9934eef166836c8100fce72f7f837cb8b2ed2b (patch) | |
| tree | 3b47e01deedcbf9133fa5733925156d75f4ed9ca /linux-user | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | serial-pci: remove memory regions from BAR before destroying them (diff) | |
| download | qemu-0a9934eef166836c8100fce72f7f837cb8b2ed2b.tar.gz qemu-0a9934eef166836c8100fce72f7f837cb8b2ed2b.tar.xz qemu-0a9934eef166836c8100fce72f7f837cb8b2ed2b.zip | |
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>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions