[Qemu-commits] [qemu/qemu] 0b9e91: fdc: Fix inserting read-only media in empty drive

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0b9e918f03df47ae393fa68d9ac37ce4820cbaaf
      
https://github.com/qemu/qemu/commit/0b9e918f03df47ae393fa68d9ac37ce4820cbaaf
  Author: Kevin Wolf <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M hw/block/fdc.c

  Log Message:
  -----------
  fdc: Fix inserting read-only media in empty drive

In order to insert a read-only medium (i.e. a read-only block node) to
the BlockBackend of a floppy drive, we must not have taken write
permissions on that BlockBackend, or the operation will fail with the
error message "Block node is read-only".

The device already takes care to remove all permissions when the medium
is ejected, but the state isn't correct if the drive is initially empty:
It uses blk_is_read_only() to check whether write permissions should be
taken, but this function returns false for empty BlockBackends in the
common case.

Fix floppy_drive_realize() to avoid taking write permissions if the
drive is empty.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>


  Commit: 68174160144c9263366a4397ef8b417698e2735c
      
https://github.com/qemu/qemu/commit/68174160144c9263366a4397ef8b417698e2735c
  Author: Kevin Wolf <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M tests/qemu-iotests/118
    M tests/qemu-iotests/118.out

  Log Message:
  -----------
  iotests/118: Test inserting a read-only medium

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>


  Commit: 62ae78c77a6d83e6acf083d24e1be8544a5fe7bc
      
https://github.com/qemu/qemu/commit/62ae78c77a6d83e6acf083d24e1be8544a5fe7bc
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M hw/block/fdc.c
    M tests/qemu-iotests/118
    M tests/qemu-iotests/118.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- fdc: Fix inserting read-only media in empty drive

# gpg: Signature made Tue 30 Jul 2019 16:32:14 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests/118: Test inserting a read-only medium
  fdc: Fix inserting read-only media in empty drive

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/8517bf840562...62ae78c77a6d