block: Add strong_runtime_opts to BlockDriver
This new field can be set by block drivers to list the runtime options they accept that may influence the contents of the respective BDS. As of a follow-up patch, this list will be used by the common bdrv_refresh_filename() implementation to decide which options to put into BDS.full_open_options (and consequently whether a JSON filename has to be created), thus freeing the drivers of having to implement that logic themselves. Additionally, this patch adds the field to all of the block drivers that need it and sets it accordingly. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Message-id: 20190201192935.18394-22-mreitz@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz
parent
c0625e8092
commit
2654267cc1
@ -888,6 +888,20 @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char *const blkdebug_strong_runtime_opts[] = {
|
||||
"config",
|
||||
"inject-error.",
|
||||
"set-state.",
|
||||
"align",
|
||||
"max-transfer",
|
||||
"opt-write-zero",
|
||||
"max-write-zero",
|
||||
"opt-discard",
|
||||
"max-discard",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_blkdebug = {
|
||||
.format_name = "blkdebug",
|
||||
.protocol_name = "blkdebug",
|
||||
@ -917,6 +931,8 @@ static BlockDriver bdrv_blkdebug = {
|
||||
= blkdebug_debug_remove_breakpoint,
|
||||
.bdrv_debug_resume = blkdebug_debug_resume,
|
||||
.bdrv_debug_is_suspended = blkdebug_debug_is_suspended,
|
||||
|
||||
.strong_runtime_opts = blkdebug_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_blkdebug_init(void)
|
||||
|
||||
@ -517,6 +517,13 @@ blk_log_writes_co_pdiscard(BlockDriverState *bs, int64_t offset, int count)
|
||||
LOG_DISCARD_FLAG, false);
|
||||
}
|
||||
|
||||
static const char *const blk_log_writes_strong_runtime_opts[] = {
|
||||
"log-append",
|
||||
"log-sector-size",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_blk_log_writes = {
|
||||
.format_name = "blklogwrites",
|
||||
.instance_size = sizeof(BDRVBlkLogWritesState),
|
||||
@ -536,6 +543,7 @@ static BlockDriver bdrv_blk_log_writes = {
|
||||
.bdrv_co_block_status = bdrv_co_block_status_from_file,
|
||||
|
||||
.is_filter = true,
|
||||
.strong_runtime_opts = blk_log_writes_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_blk_log_writes_init(void)
|
||||
|
||||
@ -619,6 +619,12 @@ block_crypto_get_specific_info_luks(BlockDriverState *bs, Error **errp)
|
||||
return spec_info;
|
||||
}
|
||||
|
||||
static const char *const block_crypto_strong_runtime_opts[] = {
|
||||
BLOCK_CRYPTO_OPT_LUKS_KEY_SECRET,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
BlockDriver bdrv_crypto_luks = {
|
||||
.format_name = "luks",
|
||||
.instance_size = sizeof(BlockCrypto),
|
||||
@ -640,6 +646,8 @@ BlockDriver bdrv_crypto_luks = {
|
||||
.bdrv_getlength = block_crypto_getlength,
|
||||
.bdrv_get_info = block_crypto_get_info_luks,
|
||||
.bdrv_get_specific_info = block_crypto_get_specific_info_luks,
|
||||
|
||||
.strong_runtime_opts = block_crypto_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void block_crypto_init(void)
|
||||
|
||||
21
block/curl.c
21
block/curl.c
@ -947,6 +947,19 @@ static int64_t curl_getlength(BlockDriverState *bs)
|
||||
return s->len;
|
||||
}
|
||||
|
||||
static const char *const curl_strong_runtime_opts[] = {
|
||||
CURL_BLOCK_OPT_URL,
|
||||
CURL_BLOCK_OPT_SSLVERIFY,
|
||||
CURL_BLOCK_OPT_COOKIE,
|
||||
CURL_BLOCK_OPT_COOKIE_SECRET,
|
||||
CURL_BLOCK_OPT_USERNAME,
|
||||
CURL_BLOCK_OPT_PASSWORD_SECRET,
|
||||
CURL_BLOCK_OPT_PROXY_USERNAME,
|
||||
CURL_BLOCK_OPT_PROXY_PASSWORD_SECRET,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_http = {
|
||||
.format_name = "http",
|
||||
.protocol_name = "http",
|
||||
@ -961,6 +974,8 @@ static BlockDriver bdrv_http = {
|
||||
|
||||
.bdrv_detach_aio_context = curl_detach_aio_context,
|
||||
.bdrv_attach_aio_context = curl_attach_aio_context,
|
||||
|
||||
.strong_runtime_opts = curl_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_https = {
|
||||
@ -977,6 +992,8 @@ static BlockDriver bdrv_https = {
|
||||
|
||||
.bdrv_detach_aio_context = curl_detach_aio_context,
|
||||
.bdrv_attach_aio_context = curl_attach_aio_context,
|
||||
|
||||
.strong_runtime_opts = curl_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_ftp = {
|
||||
@ -993,6 +1010,8 @@ static BlockDriver bdrv_ftp = {
|
||||
|
||||
.bdrv_detach_aio_context = curl_detach_aio_context,
|
||||
.bdrv_attach_aio_context = curl_attach_aio_context,
|
||||
|
||||
.strong_runtime_opts = curl_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_ftps = {
|
||||
@ -1009,6 +1028,8 @@ static BlockDriver bdrv_ftps = {
|
||||
|
||||
.bdrv_detach_aio_context = curl_detach_aio_context,
|
||||
.bdrv_attach_aio_context = curl_attach_aio_context,
|
||||
|
||||
.strong_runtime_opts = curl_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void curl_block_init(void)
|
||||
|
||||
@ -1495,6 +1495,21 @@ static int coroutine_fn qemu_gluster_co_block_status(BlockDriverState *bs,
|
||||
}
|
||||
|
||||
|
||||
static const char *const gluster_strong_open_opts[] = {
|
||||
GLUSTER_OPT_VOLUME,
|
||||
GLUSTER_OPT_PATH,
|
||||
GLUSTER_OPT_TYPE,
|
||||
GLUSTER_OPT_SERVER_PATTERN,
|
||||
GLUSTER_OPT_HOST,
|
||||
GLUSTER_OPT_PORT,
|
||||
GLUSTER_OPT_TO,
|
||||
GLUSTER_OPT_IPV4,
|
||||
GLUSTER_OPT_IPV6,
|
||||
GLUSTER_OPT_SOCKET,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_gluster = {
|
||||
.format_name = "gluster",
|
||||
.protocol_name = "gluster",
|
||||
@ -1522,6 +1537,7 @@ static BlockDriver bdrv_gluster = {
|
||||
#endif
|
||||
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||
.create_opts = &qemu_gluster_create_opts,
|
||||
.strong_runtime_opts = gluster_strong_open_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_gluster_tcp = {
|
||||
@ -1551,6 +1567,7 @@ static BlockDriver bdrv_gluster_tcp = {
|
||||
#endif
|
||||
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||
.create_opts = &qemu_gluster_create_opts,
|
||||
.strong_runtime_opts = gluster_strong_open_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_gluster_unix = {
|
||||
@ -1580,6 +1597,7 @@ static BlockDriver bdrv_gluster_unix = {
|
||||
#endif
|
||||
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||
.create_opts = &qemu_gluster_create_opts,
|
||||
.strong_runtime_opts = gluster_strong_open_opts,
|
||||
};
|
||||
|
||||
/* rdma is deprecated (actually never supported for volfile fetch).
|
||||
@ -1615,6 +1633,7 @@ static BlockDriver bdrv_gluster_rdma = {
|
||||
#endif
|
||||
.bdrv_co_block_status = qemu_gluster_co_block_status,
|
||||
.create_opts = &qemu_gluster_create_opts,
|
||||
.strong_runtime_opts = gluster_strong_open_opts,
|
||||
};
|
||||
|
||||
static void bdrv_gluster_init(void)
|
||||
|
||||
@ -2448,6 +2448,20 @@ static QemuOptsList iscsi_create_opts = {
|
||||
}
|
||||
};
|
||||
|
||||
static const char *const iscsi_strong_runtime_opts[] = {
|
||||
"transport",
|
||||
"portal",
|
||||
"target",
|
||||
"user",
|
||||
"password",
|
||||
"password-secret",
|
||||
"lun",
|
||||
"initiator-name",
|
||||
"header-digest",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_iscsi = {
|
||||
.format_name = "iscsi",
|
||||
.protocol_name = "iscsi",
|
||||
@ -2482,6 +2496,8 @@ static BlockDriver bdrv_iscsi = {
|
||||
|
||||
.bdrv_detach_aio_context = iscsi_detach_aio_context,
|
||||
.bdrv_attach_aio_context = iscsi_attach_aio_context,
|
||||
|
||||
.strong_runtime_opts = iscsi_strong_runtime_opts,
|
||||
};
|
||||
|
||||
#if LIBISCSI_API_VERSION >= (20160603)
|
||||
@ -2519,6 +2535,8 @@ static BlockDriver bdrv_iser = {
|
||||
|
||||
.bdrv_detach_aio_context = iscsi_detach_aio_context,
|
||||
.bdrv_attach_aio_context = iscsi_attach_aio_context,
|
||||
|
||||
.strong_runtime_opts = iscsi_strong_runtime_opts,
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
14
block/nbd.c
14
block/nbd.c
@ -538,6 +538,17 @@ static char *nbd_dirname(BlockDriverState *bs, Error **errp)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const char *const nbd_strong_runtime_opts[] = {
|
||||
"path",
|
||||
"host",
|
||||
"port",
|
||||
"export",
|
||||
"tls-creds",
|
||||
"server.",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_nbd = {
|
||||
.format_name = "nbd",
|
||||
.protocol_name = "nbd",
|
||||
@ -557,6 +568,7 @@ static BlockDriver bdrv_nbd = {
|
||||
.bdrv_refresh_filename = nbd_refresh_filename,
|
||||
.bdrv_co_block_status = nbd_client_co_block_status,
|
||||
.bdrv_dirname = nbd_dirname,
|
||||
.strong_runtime_opts = nbd_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_nbd_tcp = {
|
||||
@ -578,6 +590,7 @@ static BlockDriver bdrv_nbd_tcp = {
|
||||
.bdrv_refresh_filename = nbd_refresh_filename,
|
||||
.bdrv_co_block_status = nbd_client_co_block_status,
|
||||
.bdrv_dirname = nbd_dirname,
|
||||
.strong_runtime_opts = nbd_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_nbd_unix = {
|
||||
@ -599,6 +612,7 @@ static BlockDriver bdrv_nbd_unix = {
|
||||
.bdrv_refresh_filename = nbd_refresh_filename,
|
||||
.bdrv_co_block_status = nbd_client_co_block_status,
|
||||
.bdrv_dirname = nbd_dirname,
|
||||
.strong_runtime_opts = nbd_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_nbd_init(void)
|
||||
|
||||
11
block/nfs.c
11
block/nfs.c
@ -878,6 +878,15 @@ static void coroutine_fn nfs_co_invalidate_cache(BlockDriverState *bs,
|
||||
}
|
||||
#endif
|
||||
|
||||
static const char *nfs_strong_runtime_opts[] = {
|
||||
"path",
|
||||
"user",
|
||||
"group",
|
||||
"server.",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_nfs = {
|
||||
.format_name = "nfs",
|
||||
.protocol_name = "nfs",
|
||||
@ -905,6 +914,8 @@ static BlockDriver bdrv_nfs = {
|
||||
.bdrv_refresh_filename = nfs_refresh_filename,
|
||||
.bdrv_dirname = nfs_dirname,
|
||||
|
||||
.strong_runtime_opts = nfs_strong_runtime_opts,
|
||||
|
||||
#ifdef LIBNFS_FEATURE_PAGECACHE
|
||||
.bdrv_co_invalidate_cache = nfs_co_invalidate_cache,
|
||||
#endif
|
||||
|
||||
@ -252,6 +252,13 @@ static void null_refresh_filename(BlockDriverState *bs, QDict *opts)
|
||||
bs->full_open_options = qobject_ref(opts);
|
||||
}
|
||||
|
||||
static const char *const null_strong_runtime_opts[] = {
|
||||
BLOCK_OPT_SIZE,
|
||||
NULL_OPT_ZEROES,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_null_co = {
|
||||
.format_name = "null-co",
|
||||
.protocol_name = "null-co",
|
||||
@ -269,6 +276,7 @@ static BlockDriver bdrv_null_co = {
|
||||
.bdrv_co_block_status = null_co_block_status,
|
||||
|
||||
.bdrv_refresh_filename = null_refresh_filename,
|
||||
.strong_runtime_opts = null_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_null_aio = {
|
||||
@ -288,6 +296,7 @@ static BlockDriver bdrv_null_aio = {
|
||||
.bdrv_co_block_status = null_co_block_status,
|
||||
|
||||
.bdrv_refresh_filename = null_refresh_filename,
|
||||
.strong_runtime_opts = null_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_null_init(void)
|
||||
|
||||
@ -1136,6 +1136,13 @@ static void nvme_unregister_buf(BlockDriverState *bs, void *host)
|
||||
qemu_vfio_dma_unmap(s->vfio, host);
|
||||
}
|
||||
|
||||
static const char *const nvme_strong_runtime_opts[] = {
|
||||
NVME_BLOCK_OPT_DEVICE,
|
||||
NVME_BLOCK_OPT_NAMESPACE,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_nvme = {
|
||||
.format_name = "nvme",
|
||||
.protocol_name = "nvme",
|
||||
@ -1153,6 +1160,7 @@ static BlockDriver bdrv_nvme = {
|
||||
|
||||
.bdrv_refresh_filename = nvme_refresh_filename,
|
||||
.bdrv_refresh_limits = nvme_refresh_limits,
|
||||
.strong_runtime_opts = nvme_strong_runtime_opts,
|
||||
|
||||
.bdrv_detach_aio_context = nvme_detach_aio_context,
|
||||
.bdrv_attach_aio_context = nvme_attach_aio_context,
|
||||
|
||||
@ -1186,6 +1186,12 @@ static QemuOptsList qcow_create_opts = {
|
||||
}
|
||||
};
|
||||
|
||||
static const char *const qcow_strong_runtime_opts[] = {
|
||||
"encrypt." BLOCK_CRYPTO_OPT_QCOW_KEY_SECRET,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_qcow = {
|
||||
.format_name = "qcow",
|
||||
.instance_size = sizeof(BDRVQcowState),
|
||||
@ -1209,6 +1215,7 @@ static BlockDriver bdrv_qcow = {
|
||||
.bdrv_get_info = qcow_get_info,
|
||||
|
||||
.create_opts = &qcow_create_opts,
|
||||
.strong_runtime_opts = qcow_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_qcow_init(void)
|
||||
|
||||
@ -4936,6 +4936,12 @@ static QemuOptsList qcow2_create_opts = {
|
||||
}
|
||||
};
|
||||
|
||||
static const char *const qcow2_strong_runtime_opts[] = {
|
||||
"encrypt." BLOCK_CRYPTO_OPT_QCOW_KEY_SECRET,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
BlockDriver bdrv_qcow2 = {
|
||||
.format_name = "qcow2",
|
||||
.instance_size = sizeof(BDRVQcow2State),
|
||||
@ -4984,6 +4990,7 @@ BlockDriver bdrv_qcow2 = {
|
||||
.bdrv_inactivate = qcow2_inactivate,
|
||||
|
||||
.create_opts = &qcow2_create_opts,
|
||||
.strong_runtime_opts = qcow2_strong_runtime_opts,
|
||||
.bdrv_co_check = qcow2_co_check,
|
||||
.bdrv_amend_options = qcow2_amend_options,
|
||||
|
||||
|
||||
@ -1104,6 +1104,15 @@ static char *quorum_dirname(BlockDriverState *bs, Error **errp)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const char *const quorum_strong_runtime_opts[] = {
|
||||
QUORUM_OPT_VOTE_THRESHOLD,
|
||||
QUORUM_OPT_BLKVERIFY,
|
||||
QUORUM_OPT_REWRITE,
|
||||
QUORUM_OPT_READ_PATTERN,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_quorum = {
|
||||
.format_name = "quorum",
|
||||
|
||||
@ -1128,6 +1137,8 @@ static BlockDriver bdrv_quorum = {
|
||||
|
||||
.is_filter = true,
|
||||
.bdrv_recurse_is_first_non_filter = quorum_recurse_is_first_non_filter,
|
||||
|
||||
.strong_runtime_opts = quorum_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_quorum_init(void)
|
||||
|
||||
@ -532,6 +532,13 @@ static int coroutine_fn raw_co_copy_range_to(BlockDriverState *bs,
|
||||
read_flags, write_flags);
|
||||
}
|
||||
|
||||
static const char *const raw_strong_runtime_opts[] = {
|
||||
"offset",
|
||||
"size",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
BlockDriver bdrv_raw = {
|
||||
.format_name = "raw",
|
||||
.instance_size = sizeof(BDRVRawState),
|
||||
@ -561,7 +568,8 @@ BlockDriver bdrv_raw = {
|
||||
.bdrv_lock_medium = &raw_lock_medium,
|
||||
.bdrv_co_ioctl = &raw_co_ioctl,
|
||||
.create_opts = &raw_create_opts,
|
||||
.bdrv_has_zero_init = &raw_has_zero_init
|
||||
.bdrv_has_zero_init = &raw_has_zero_init,
|
||||
.strong_runtime_opts = raw_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_raw_init(void)
|
||||
|
||||
14
block/rbd.c
14
block/rbd.c
@ -1228,6 +1228,18 @@ static QemuOptsList qemu_rbd_create_opts = {
|
||||
}
|
||||
};
|
||||
|
||||
static const char *const qemu_rbd_strong_runtime_opts[] = {
|
||||
"pool",
|
||||
"image",
|
||||
"conf",
|
||||
"snapshot",
|
||||
"user",
|
||||
"server.",
|
||||
"password-secret",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_rbd = {
|
||||
.format_name = "rbd",
|
||||
.instance_size = sizeof(BDRVRBDState),
|
||||
@ -1265,6 +1277,8 @@ static BlockDriver bdrv_rbd = {
|
||||
#ifdef LIBRBD_SUPPORTS_INVALIDATE
|
||||
.bdrv_co_invalidate_cache = qemu_rbd_co_invalidate_cache,
|
||||
#endif
|
||||
|
||||
.strong_runtime_opts = qemu_rbd_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_rbd_init(void)
|
||||
|
||||
@ -676,6 +676,13 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp)
|
||||
aio_context_release(aio_context);
|
||||
}
|
||||
|
||||
static const char *const replication_strong_runtime_opts[] = {
|
||||
REPLICATION_MODE,
|
||||
REPLICATION_TOP_ID,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
BlockDriver bdrv_replication = {
|
||||
.format_name = "replication",
|
||||
.instance_size = sizeof(BDRVReplicationState),
|
||||
@ -692,6 +699,7 @@ BlockDriver bdrv_replication = {
|
||||
.bdrv_recurse_is_first_non_filter = replication_recurse_is_first_non_filter,
|
||||
|
||||
.has_variable_length = true,
|
||||
.strong_runtime_opts = replication_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_replication_init(void)
|
||||
|
||||
@ -3203,6 +3203,15 @@ static QemuOptsList sd_create_opts = {
|
||||
}
|
||||
};
|
||||
|
||||
static const char *const sd_strong_runtime_opts[] = {
|
||||
"vdi",
|
||||
"snap-id",
|
||||
"tag",
|
||||
"server.",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_sheepdog = {
|
||||
.format_name = "sheepdog",
|
||||
.protocol_name = "sheepdog",
|
||||
@ -3238,6 +3247,7 @@ static BlockDriver bdrv_sheepdog = {
|
||||
.bdrv_attach_aio_context = sd_attach_aio_context,
|
||||
|
||||
.create_opts = &sd_create_opts,
|
||||
.strong_runtime_opts = sd_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_sheepdog_tcp = {
|
||||
@ -3275,6 +3285,7 @@ static BlockDriver bdrv_sheepdog_tcp = {
|
||||
.bdrv_attach_aio_context = sd_attach_aio_context,
|
||||
|
||||
.create_opts = &sd_create_opts,
|
||||
.strong_runtime_opts = sd_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_sheepdog_unix = {
|
||||
@ -3312,6 +3323,7 @@ static BlockDriver bdrv_sheepdog_unix = {
|
||||
.bdrv_attach_aio_context = sd_attach_aio_context,
|
||||
|
||||
.create_opts = &sd_create_opts,
|
||||
.strong_runtime_opts = sd_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_sheepdog_init(void)
|
||||
|
||||
12
block/ssh.c
12
block/ssh.c
@ -1254,6 +1254,17 @@ static int coroutine_fn ssh_co_truncate(BlockDriverState *bs, int64_t offset,
|
||||
return ssh_grow_file(s, offset, errp);
|
||||
}
|
||||
|
||||
static const char *const ssh_strong_runtime_opts[] = {
|
||||
"host",
|
||||
"port",
|
||||
"path",
|
||||
"user",
|
||||
"host_key_check",
|
||||
"server.",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_ssh = {
|
||||
.format_name = "ssh",
|
||||
.protocol_name = "ssh",
|
||||
@ -1270,6 +1281,7 @@ static BlockDriver bdrv_ssh = {
|
||||
.bdrv_co_truncate = ssh_co_truncate,
|
||||
.bdrv_co_flush_to_disk = ssh_co_flush,
|
||||
.create_opts = &ssh_create_opts,
|
||||
.strong_runtime_opts = ssh_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_ssh_init(void)
|
||||
|
||||
@ -227,6 +227,12 @@ static void coroutine_fn throttle_co_drain_end(BlockDriverState *bs)
|
||||
atomic_dec(&tgm->io_limits_disabled);
|
||||
}
|
||||
|
||||
static const char *const throttle_strong_runtime_opts[] = {
|
||||
QEMU_OPT_THROTTLE_GROUP_NAME,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_throttle = {
|
||||
.format_name = "throttle",
|
||||
.instance_size = sizeof(ThrottleGroupMember),
|
||||
@ -259,6 +265,7 @@ static BlockDriver bdrv_throttle = {
|
||||
.bdrv_co_drain_end = throttle_co_drain_end,
|
||||
|
||||
.is_filter = true,
|
||||
.strong_runtime_opts = throttle_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_throttle_init(void)
|
||||
|
||||
@ -1218,6 +1218,12 @@ static QemuOptsList vpc_create_opts = {
|
||||
}
|
||||
};
|
||||
|
||||
static const char *const vpc_strong_runtime_opts[] = {
|
||||
VPC_OPT_SIZE_CALC,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_vpc = {
|
||||
.format_name = "vpc",
|
||||
.instance_size = sizeof(BDRVVPCState),
|
||||
@ -1238,6 +1244,7 @@ static BlockDriver bdrv_vpc = {
|
||||
|
||||
.create_opts = &vpc_create_opts,
|
||||
.bdrv_has_zero_init = vpc_has_zero_init,
|
||||
.strong_runtime_opts = vpc_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_vpc_init(void)
|
||||
|
||||
@ -3253,6 +3253,16 @@ static void vvfat_close(BlockDriverState *bs)
|
||||
}
|
||||
}
|
||||
|
||||
static const char *const vvfat_strong_runtime_opts[] = {
|
||||
"dir",
|
||||
"fat-type",
|
||||
"floppy",
|
||||
"label",
|
||||
"rw",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_vvfat = {
|
||||
.format_name = "vvfat",
|
||||
.protocol_name = "fat",
|
||||
@ -3267,6 +3277,8 @@ static BlockDriver bdrv_vvfat = {
|
||||
.bdrv_co_preadv = vvfat_co_preadv,
|
||||
.bdrv_co_pwritev = vvfat_co_pwritev,
|
||||
.bdrv_co_block_status = vvfat_co_block_status,
|
||||
|
||||
.strong_runtime_opts = vvfat_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_vvfat_init(void)
|
||||
|
||||
11
block/vxhs.c
11
block/vxhs.c
@ -556,6 +556,16 @@ static int64_t vxhs_getlength(BlockDriverState *bs)
|
||||
return vdisk_size;
|
||||
}
|
||||
|
||||
static const char *const vxhs_strong_runtime_opts[] = {
|
||||
VXHS_OPT_VDISK_ID,
|
||||
"tls-creds",
|
||||
VXHS_OPT_HOST,
|
||||
VXHS_OPT_PORT,
|
||||
VXHS_OPT_SERVER".",
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static BlockDriver bdrv_vxhs = {
|
||||
.format_name = "vxhs",
|
||||
.protocol_name = "vxhs",
|
||||
@ -567,6 +577,7 @@ static BlockDriver bdrv_vxhs = {
|
||||
.bdrv_getlength = vxhs_getlength,
|
||||
.bdrv_aio_preadv = vxhs_aio_preadv,
|
||||
.bdrv_aio_pwritev = vxhs_aio_pwritev,
|
||||
.strong_runtime_opts = vxhs_strong_runtime_opts,
|
||||
};
|
||||
|
||||
static void bdrv_vxhs_init(void)
|
||||
|
||||
@ -517,6 +517,13 @@ struct BlockDriver {
|
||||
void (*bdrv_register_buf)(BlockDriverState *bs, void *host, size_t size);
|
||||
void (*bdrv_unregister_buf)(BlockDriverState *bs, void *host);
|
||||
QLIST_ENTRY(BlockDriver) list;
|
||||
|
||||
/* Pointer to a NULL-terminated array of names of strong options
|
||||
* that can be specified for bdrv_open(). A strong option is one
|
||||
* that changes the data of a BDS.
|
||||
* If this pointer is NULL, the array is considered empty.
|
||||
* "filename" and "driver" are always considered strong. */
|
||||
const char *const *strong_runtime_opts;
|
||||
};
|
||||
|
||||
typedef struct BlockLimits {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user