block: Separate blk_is_writable() and blk_supports_write_perm()
Currently, blk_is_read_only() tells whether a given BlockBackend can only be used in read-only mode because its root node is read-only. Some callers actually try to answer a slightly different question: Is the BlockBackend configured to be writable, by taking write permissions on the root node? This can differ, for example, for CD-ROM devices which don't take write permissions, but may be backed by a writable image file. scsi-cd allows write requests to the drive if blk_is_read_only() returns false. However, the write request will immediately run into an assertion failure because the write permission is missing. This patch introduces separate functions for both questions. blk_supports_write_perm() answers the question whether the block node/image file can support writable devices, whereas blk_is_writable() tells whether the BlockBackend is currently configured to be writable. All calls of blk_is_read_only() are converted to one of the two new functions. Fixes: https://bugs.launchpad.net/bugs/1906693 Cc: qemu-stable@nongnu.org Signed-off-by:Kevin Wolf <kwolf@redhat.com> Message-Id: <20210118123448.307825-2-kwolf@redhat.com> Reviewed-by:
Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by:
Max Reitz <mreitz@redhat.com> Signed-off-by:
Kevin Wolf <kwolf@redhat.com>
Showing
- block/block-backend.c 16 additions, 3 deletionsblock/block-backend.c
- hw/block/dataplane/xen-block.c 1 addition, 1 deletionhw/block/dataplane/xen-block.c
- hw/block/fdc.c 5 additions, 4 deletionshw/block/fdc.c
- hw/block/m25p80.c 3 additions, 3 deletionshw/block/m25p80.c
- hw/block/nand.c 1 addition, 1 deletionhw/block/nand.c
- hw/block/nvme-ns.c 4 additions, 3 deletionshw/block/nvme-ns.c
- hw/block/onenand.c 1 addition, 1 deletionhw/block/onenand.c
- hw/block/pflash_cfi01.c 1 addition, 1 deletionhw/block/pflash_cfi01.c
- hw/block/pflash_cfi02.c 1 addition, 1 deletionhw/block/pflash_cfi02.c
- hw/block/swim.c 3 additions, 3 deletionshw/block/swim.c
- hw/block/virtio-blk.c 3 additions, 3 deletionshw/block/virtio-blk.c
- hw/block/xen-block.c 1 addition, 1 deletionhw/block/xen-block.c
- hw/ide/core.c 1 addition, 1 deletionhw/ide/core.c
- hw/misc/sifive_u_otp.c 1 addition, 1 deletionhw/misc/sifive_u_otp.c
- hw/ppc/pnv_pnor.c 1 addition, 1 deletionhw/ppc/pnv_pnor.c
- hw/scsi/scsi-disk.c 5 additions, 5 deletionshw/scsi/scsi-disk.c
- hw/scsi/scsi-generic.c 2 additions, 2 deletionshw/scsi/scsi-generic.c
- hw/sd/sd.c 3 additions, 3 deletionshw/sd/sd.c
- hw/usb/dev-storage.c 2 additions, 2 deletionshw/usb/dev-storage.c
- include/sysemu/block-backend.h 2 additions, 1 deletioninclude/sysemu/block-backend.h
Loading
Please register or sign in to comment