From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hC436-0005Dc-4X for qemu-devel@nongnu.org; Thu, 04 Apr 2019 11:13:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hC434-0007uh-9E for qemu-devel@nongnu.org; Thu, 04 Apr 2019 11:13:04 -0400 From: Kevin Wolf Date: Thu, 4 Apr 2019 17:07:46 +0200 Message-Id: <20190404150746.12585-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-4.0] block: Forward 'discard' to temporary overlay List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, qemu-devel@nongnu.org When bdrv_temp_snapshot_options() is called for snapshot=3Don, 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: Kevin Wolf --- block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 3050854528..16615bc876 100644 --- a/block.c +++ b/block.c @@ -950,8 +950,9 @@ static void bdrv_temp_snapshot_options(int *child_fla= gs, 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"); =20 - /* 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); =20 /* aio=3Dnative doesn't work for cache.direct=3Doff, so disable it f= or the * temporary snapshot */ --=20 2.20.1