[Qemu-commits] [qemu/qemu] db01ee: vfio: Correction in vfio_rom_read when attempting ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: db01eedb6d883a1fed5b4079f8a6ff048b9c1217
      
https://github.com/qemu/qemu/commit/db01eedb6d883a1fed5b4079f8a6ff048b9c1217
  Author: Bandan Das <address@hidden>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M hw/misc/vfio.c

  Log Message:
  -----------
  vfio: Correction in vfio_rom_read when attempting rom loading

commit e638073c569e801ce9de added a flag to track whether
a previous rom read had failed. Accidentally, the code
ended up adding vfio_load_option_rom twice. (Thanks to Alex
for spotting it)

Signed-off-by: Bandan Das <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 4e505ddd9af1d5810378a4e7b851f788b1c075ba
      
https://github.com/qemu/qemu/commit/4e505ddd9af1d5810378a4e7b851f788b1c075ba
  Author: Alex Williamson <address@hidden>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M hw/misc/vfio.c

  Log Message:
  -----------
  vfio: Cosmetic error reporting fixes

* Remove terminating newlines from hw_error() and error_report() calls
* Fix cut-n-paste error in text (s/to/from/)

Signed-off-by: Alex Williamson <address@hidden>


  Commit: b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a
      
https://github.com/qemu/qemu/commit/b9bf8a1abb1cafe7184e3dbad9bf8819b3cb620a
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M hw/misc/vfio.c

  Log Message:
  -----------
  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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/169e4878ee96...b9bf8a1abb1c