From: Peter Maydell Date: Tue, 25 Mar 2014 18:30:52 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-pci-for-qemu-20140325.0... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a;p=qemu.git 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 --- b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a