diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-28 17:39:49 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-28 17:39:49 +0000 |
| commit | 9514f2648ca05b38e852b490a12b8cd98d5808c1 (patch) | |
| tree | 9e45472a9e075f7be57b8af7452e2133bf2d008e /pc-bios/QEMU,tcx.bin | |
| parent | 7d1730b7d9d8272a13245adfc9b0405e5a4bd0c2 (diff) | |
| parent | a2a7862ca9ab1689f094c319ec92ecbd6fd1b46d (diff) | |
| download | qemu-9514f2648ca05b38e852b490a12b8cd98d5808c1.zip qemu-9514f2648ca05b38e852b490a12b8cd98d5808c1.tar.gz qemu-9514f2648ca05b38e852b490a12b8cd98d5808c1.tar.bz2 | |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
This pull request brings:
- a fix to a minor bug reported by Coverity
- throttling support in the local backend (command line only)
# gpg: Signature made Tue 28 Feb 2017 09:32:30 GMT
# gpg: using DSA key 0x02FC3AEB0101DBC2
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg: aka "Greg Kurz <groug@free.fr>"
# gpg: aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
# gpg: aka "Gregory Kurz (Groug) <groug@free.fr>"
# gpg: aka "[jpeg image of size 3330]"
# 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: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2
* remotes/gkurz/tags/for-upstream:
throttle: factor out duplicate code
fsdev: add IO throttle support to fsdev devices
9pfs: fix v9fs_lock error case
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'pc-bios/QEMU,tcx.bin')
0 files changed, 0 insertions, 0 deletions