diff options
author | Kevin Wolf | 2021-01-18 13:34:47 +0100 |
---|---|---|
committer | Kevin Wolf | 2021-01-27 20:45:20 +0100 |
commit | 86b1cf322789b79c8ace977430ac6a443d491cc0 (patch) | |
tree | baac83ce91c3f7ea7c7ec61fa9249b205459b387 /hw/ppc | |
parent | Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2021-01-27... (diff) | |
download | qemu-86b1cf322789b79c8ace977430ac6a443d491cc0.tar.gz qemu-86b1cf322789b79c8ace977430ac6a443d491cc0.tar.xz qemu-86b1cf322789b79c8ace977430ac6a443d491cc0.zip |
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>
Diffstat (limited to 'hw/ppc')
-rw-r--r-- | hw/ppc/pnv_pnor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c index ef8dff03e0..4b455de1ea 100644 --- a/hw/ppc/pnv_pnor.c +++ b/hw/ppc/pnv_pnor.c @@ -86,7 +86,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp) if (s->blk) { uint64_t perm = BLK_PERM_CONSISTENT_READ | - (blk_is_read_only(s->blk) ? 0 : BLK_PERM_WRITE); + (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0); ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp); if (ret < 0) { return; |