diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-25 18:30:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-25 18:30:52 +0000 |
| commit | b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a (patch) | |
| tree | 1d188881e35a3cb95d5e10a9e3de496c710e0767 /block/qed-l2-cache.c | |
| parent | 169e4878ee96b7d6dec929e0cd400a0395865a85 (diff) | |
| parent | 4e505ddd9af1d5810378a4e7b851f788b1c075ba (diff) | |
| download | qemu-b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a.tar.gz qemu-b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a.tar.bz2 qemu-b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-pci-for-qemu-20140325.0' into staging
A couple trivial fixes for QEMU 2.0:
- Coding correction that allowed attempts to read the device
ROM after we'd already marked it failed (Bandan)
- Cosmetic error reporting fixes to remove unnecessary new lines
and fix a cut-n-paste wording error (Alex)
# gpg: Signature made Tue 25 Mar 2014 18:18:57 GMT using RSA key ID 3BB08B22
# gpg: Can't check signature: public key not found
* remotes/awilliam/tags/vfio-pci-for-qemu-20140325.0:
vfio: Cosmetic error reporting fixes
vfio: Correction in vfio_rom_read when attempting rom loading
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/qed-l2-cache.c')
0 files changed, 0 insertions, 0 deletions