]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20200522' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 22 May 2020 17:54:47 +0000 (18:54 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 22 May 2020 17:54:47 +0000 (18:54 +0100)
commitfea8f3ed739536fca027cf56af7f5576f37ef9cd
tree62123c3764a2cad6b4a8dcfbf0054e8015775983
parent1cc9c62e42445f2346bf0842cafe82c5ba404529
parent1857b9db49770590483be44eb90993c42b2a5a99
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20200522' into staging

- Remove unused timer in CFI01 flash,
- Clean up code documentation,
- Silent a long-standing Coverity warning (2016-07-15).

# gpg: Signature made Fri 22 May 2020 18:43:03 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/pflash-next-20200522:
  hw/block/pflash: Check return value of blk_pwrite()
  hw/block/pflash_cfi01: Rename 'reset_flash' label as 'mode_read_array'
  hw/block/pflash_cfi01: Document use of non-CFI compliant command '0x00'
  hw/block/pflash_cfi01: Removed an unused timer

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>