Commit 3f48686f authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Forward 'discard' to temporary overlay 



When bdrv_temp_snapshot_options() is called for snapshot=on, the
'discard' option in the options QDict hasn't been parsed and merged into
the flags yet. So copy the dict entry to make sure that the temporary
overlay enables discard when it was requested for the drive.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
parent f55a585d

block.c

+2 −1
Original line number Diff line number Diff line
@@ -950,8 +950,9 @@ static void bdrv_temp_snapshot_options(int *child_flags, QDict *child_options, 
    qdict_set_default_str(child_options, BDRV_OPT_CACHE_DIRECT, "off");

    qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on");



    /* Copy the read-only option from the parent */

    /* Copy the read-only and discard options from the parent */

    qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);

    qdict_copy_default(child_options, parent_options, BDRV_OPT_DISCARD);



    /* aio=native doesn't work for cache.direct=off, so disable it for the

     * temporary snapshot */