openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: replace "discard" literal with BDRV_OPT_DISCARD macro 

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Alberto Garcia 2018-10-03 13:23:13 +03:00 committed by Kevin Wolf
parent a2b83a5165
commit 415bbca86d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block.c
View File

@ -1327,7 +1327,7 @@ QemuOptsList bdrv_runtime_opts = {
.help = "try to optimize zero writes (off, on, unmap)", .help = "try to optimize zero writes (off, on, unmap)",
}, },
{ {
.name = "discard", .name = BDRV_OPT_DISCARD,
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
.help = "discard operation (ignore/off, unmap/on)", .help = "discard operation (ignore/off, unmap/on)",
}, },
@ -1432,7 +1432,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
} }
} }
discard = qemu_opt_get(opts, "discard"); discard = qemu_opt_get(opts, BDRV_OPT_DISCARD);
if (discard != NULL) { if (discard != NULL) {
if (bdrv_parse_discard_flags(discard, &bs->open_flags) != 0) { if (bdrv_parse_discard_flags(discard, &bs->open_flags) != 0) {
error_setg(errp, "Invalid discard option"); error_setg(errp, "Invalid discard option");
@ -3186,7 +3186,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
update_flags_from_options(&reopen_state->flags, opts); update_flags_from_options(&reopen_state->flags, opts);
discard = qemu_opt_get_del(opts, "discard"); discard = qemu_opt_get_del(opts, BDRV_OPT_DISCARD);
if (discard != NULL) { if (discard != NULL) {
if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) { if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {
error_setg(errp, "Invalid discard option"); error_setg(errp, "Invalid discard option");