From: Kevin Wolf <kwolf@redhat.com> To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] qcow2: Fix qcow2_make_empty() with external data file Date: Mon, 29 Apr 2019 12:57:41 +0200 [thread overview] Message-ID: <20190429105741.31033-1-kwolf@redhat.com> (raw) make_completely_empty() is an optimisated path for bdrv_make_empty() where completely new metadata is created inside the image file instead of going through all clusters and discarding them. For an external data file, however, we actually need to do discard operations on the data file; just overwriting the qcow2 file doesn't get rid of the data. The necessary slow path with an explicit discard operation already exists for other cases. Use it for external data files, too. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block/qcow2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 7fbef97aab..097fde56f9 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4384,7 +4384,8 @@ static int qcow2_make_empty(BlockDriverState *bs) if (s->qcow_version >= 3 && !s->snapshots && !s->nb_bitmaps && 3 + l1_clusters <= s->refcount_block_size && - s->crypt_method_header != QCOW_CRYPT_LUKS) { + s->crypt_method_header != QCOW_CRYPT_LUKS && + !has_data_file(bs)) { /* The following function only works for qcow2 v3 images (it * requires the dirty flag) and only as long as there are no * features that reserve extra clusters (such as snapshots, -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Kevin Wolf <kwolf@redhat.com> To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org, qemu-stable@nongnu.org, mreitz@redhat.com Subject: [Qemu-devel] [PATCH] qcow2: Fix qcow2_make_empty() with external data file Date: Mon, 29 Apr 2019 12:57:41 +0200 [thread overview] Message-ID: <20190429105741.31033-1-kwolf@redhat.com> (raw) Message-ID: <20190429105741.L_CkzN1tVe_ERVxRjpOQfHLrL5vb1FU40WI5_mZi2ec@z> (raw) make_completely_empty() is an optimisated path for bdrv_make_empty() where completely new metadata is created inside the image file instead of going through all clusters and discarding them. For an external data file, however, we actually need to do discard operations on the data file; just overwriting the qcow2 file doesn't get rid of the data. The necessary slow path with an explicit discard operation already exists for other cases. Use it for external data files, too. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block/qcow2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 7fbef97aab..097fde56f9 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4384,7 +4384,8 @@ static int qcow2_make_empty(BlockDriverState *bs) if (s->qcow_version >= 3 && !s->snapshots && !s->nb_bitmaps && 3 + l1_clusters <= s->refcount_block_size && - s->crypt_method_header != QCOW_CRYPT_LUKS) { + s->crypt_method_header != QCOW_CRYPT_LUKS && + !has_data_file(bs)) { /* The following function only works for qcow2 v3 images (it * requires the dirty flag) and only as long as there are no * features that reserve extra clusters (such as snapshots, -- 2.20.1
next reply other threads:[~2019-04-29 10:59 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-29 10:57 Kevin Wolf [this message] 2019-04-29 10:57 ` [Qemu-devel] [PATCH] qcow2: Fix qcow2_make_empty() with external data file Kevin Wolf 2019-04-29 11:21 ` Kevin Wolf 2019-04-29 11:21 ` Kevin Wolf 2019-04-29 14:40 ` Eric Blake 2019-04-29 14:40 ` Eric Blake 2019-04-29 16:13 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi 2019-04-29 16:13 ` Stefan Hajnoczi 2019-04-30 13:54 ` [Qemu-devel] " no-reply 2019-04-30 13:54 ` no-reply 2019-04-30 15:32 ` Eric Blake 2019-04-30 15:32 ` Eric Blake 2019-04-30 15:42 ` no-reply 2019-04-30 15:42 ` no-reply
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190429105741.31033-1-kwolf@redhat.com \ --to=kwolf@redhat.com \ --cc=mreitz@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-stable@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.