aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2020-05-13 13:05:18 +0200
committerKevin Wolf <kwolf@redhat.com>2020-05-18 19:05:25 +0200
commit3cdc69d31b49bed603adc973cf06ac898a9b2914 (patch)
tree5dc6470339338c73302bcb805a3ef42189a13d2f /block
parent272c02eaef0388225c1dcdbec99b2e838bb64d23 (diff)
downloadqemu-3cdc69d31b49bed603adc973cf06ac898a9b2914.zip
qemu-3cdc69d31b49bed603adc973cf06ac898a9b2914.tar.gz
qemu-3cdc69d31b49bed603adc973cf06ac898a9b2914.tar.bz2
block: Pass parent_is_format to .inherit_options()
We plan to unify the generic .inherit_options() functions. The resulting common function will need to decide whether to force-enable format probing, force-disable it, or leave it as-is. To make this decision, it will need to know whether the parent node is a format node or not (because we never want format probing if the parent is a format node already (except for the backing chain)). Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200513110544.176672-9-mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/block-backend.c2
-rw-r--r--block/vvfat.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/block/block-backend.c b/block/block-backend.c
index 5539ca8..f2e81af 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -120,7 +120,7 @@ static QTAILQ_HEAD(, BlockBackend) block_backends =
static QTAILQ_HEAD(, BlockBackend) monitor_block_backends =
QTAILQ_HEAD_INITIALIZER(monitor_block_backends);
-static void blk_root_inherit_options(BdrvChildRole role,
+static void blk_root_inherit_options(BdrvChildRole role, bool parent_is_format,
int *child_flags, QDict *child_options,
int parent_flags, QDict *parent_options)
{
diff --git a/block/vvfat.c b/block/vvfat.c
index 4033e4f..b4c8417 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -3128,7 +3128,7 @@ static BlockDriver vvfat_write_target = {
.bdrv_co_pwritev = write_target_commit,
};
-static void vvfat_qcow_options(BdrvChildRole role,
+static void vvfat_qcow_options(BdrvChildRole role, bool parent_is_format,
int *child_flags, QDict *child_options,
int parent_flags, QDict *parent_options)
{