block: replace "discard" literal with BDRV_OPT_DISCARD macro
PATCH 1/1 block: replace "discard" literal with BDRV_OPT_DISCARD macro
Signed-off-by Alberto Garcia <[email protected]>
--- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block.c +3 -3
@@ -1327,7 +1327,7 @@ QemuOptsList bdrv_runtime_opts = { .help = "try to optimize zero writes (off, on, unmap)", }, { - .name = "discard", + .name = BDRV_OPT_DISCARD, .type = QEMU_OPT_STRING, .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 (bdrv_parse_discard_flags (discard, &bs->open_flags) !=0 ) {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); - discard =qemu_opt_get_del (opts,"discard" ); + discard =qemu_opt_get_del (opts,BDRV_OPT_DISCARD );if (discard !=NULL ) {if (bdrv_parse_discard_flags (discard, &reopen_state->flags) !=0 ) {error_setg (errp,"Invalid discard option" );
Signature · 1 line
2.11.0
Kevin Wolf
AppliedAm 03.10.2018 um 12:23 hat Alberto Garcia geschrieben:
Quoted 1 line
Signed-off-by Alberto Garcia <[email protected]>
Thanks, applied to the block branch.
Kevin