From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>,
qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com,
stefanha@redhat.com, fam@euphon.net, jsnow@redhat.com,
armbru@redhat.com, eblake@redhat.com, den@openvz.org
Subject: Re: [PATCH v10 7/9] stream: skip filters when writing backing file name to QCOW2 header
Date: Wed, 7 Oct 2020 13:14:26 +0300 [thread overview]
Message-ID: <c75c215d-ab8f-4147-5c5c-0b8b56868638@virtuozzo.com> (raw)
In-Reply-To: <1601383109-110988-8-git-send-email-andrey.shinkevich@virtuozzo.com>
29.09.2020 15:38, Andrey Shinkevich wrote:
> Avoid writing a filter JSON-name to QCOW2 image when the backing file
> is changed after the block stream job.
>
> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
> ---
> block/stream.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/block/stream.c b/block/stream.c
> index e0540ee..b0719e9 100644
> --- a/block/stream.c
> +++ b/block/stream.c
> @@ -65,6 +65,7 @@ static int stream_prepare(Job *job)
> BlockDriverState *bs = blk_bs(bjob->blk);
> BlockDriverState *unfiltered_bs = bdrv_skip_filters(bs);
> BlockDriverState *base = bdrv_filter_or_cow_bs(s->above_base);
> + BlockDriverState *base_metadata = bdrv_skip_filters(base);
Could we call it base_unfiltered in according with all such things?
> Error *local_err = NULL;
> int ret = 0;
>
> @@ -73,10 +74,10 @@ static int stream_prepare(Job *job)
>
> if (bdrv_cow_child(unfiltered_bs)) {
> const char *base_id = NULL, *base_fmt = NULL;
> - if (base) {
> - base_id = s->backing_file_str;
Seems backing_file_str becomes unused and we should drop it. So, actually,
this patch fix two problems:
- do not save backing_file_str at stream start (as base may change during the job)
- avoid json filters in final qcow2 image metadata
> - if (base->drv) {
> - base_fmt = base->drv->format_name;
> + if (base_metadata) {
> + base_id = base_metadata->filename;
> + if (base_metadata->drv) {
> + base_fmt = base_metadata->drv->format_name;
> }
> }
> bdrv_set_backing_hd(unfiltered_bs, base, &local_err);
>
--
Best regards,
Vladimir
next prev parent reply other threads:[~2020-10-07 10:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 12:38 [PATCH v10 0/9] Apply COR-filter to the block-stream permanently Andrey Shinkevich via
2020-09-29 12:38 ` [PATCH v10 1/9] copy-on-read: Support preadv/pwritev_part functions Andrey Shinkevich via
2020-09-29 12:38 ` [PATCH v10 2/9] copy-on-read: add filter append/drop functions Andrey Shinkevich via
2020-10-05 13:34 ` Vladimir Sementsov-Ogievskiy
2020-10-05 16:23 ` Andrey Shinkevich
2020-09-29 12:38 ` [PATCH v10 3/9] qapi: add filter-node-name to block-stream Andrey Shinkevich via
2020-09-29 12:38 ` [PATCH v10 4/9] copy-on-read: pass base node name to COR driver Andrey Shinkevich via
2020-10-05 14:50 ` Vladimir Sementsov-Ogievskiy
2020-09-29 12:38 ` [PATCH v10 5/9] copy-on-read: limit guest COR activity to base in " Andrey Shinkevich via
2020-10-05 14:58 ` Vladimir Sementsov-Ogievskiy
2020-10-05 16:45 ` Andrey Shinkevich
2020-10-05 18:18 ` Andrey Shinkevich
2020-09-29 12:38 ` [PATCH v10 6/9] copy-on-read: skip non-guest reads if no copy needed Andrey Shinkevich via
2020-10-07 10:06 ` Vladimir Sementsov-Ogievskiy
2020-10-07 19:01 ` Andrey Shinkevich
2020-10-07 19:28 ` Vladimir Sementsov-Ogievskiy
2020-10-09 12:56 ` Andrey Shinkevich
2020-09-29 12:38 ` [PATCH v10 7/9] stream: skip filters when writing backing file name to QCOW2 header Andrey Shinkevich via
2020-10-07 10:14 ` Vladimir Sementsov-Ogievskiy [this message]
2020-09-29 12:38 ` [PATCH v10 8/9] block: remove unused backing-file name parameter Andrey Shinkevich via
2020-10-07 10:21 ` Vladimir Sementsov-Ogievskiy
2020-10-07 19:32 ` Andrey Shinkevich
2020-09-29 12:38 ` [PATCH v10 9/9] block: apply COR-filter to block-stream jobs Andrey Shinkevich via
2020-10-07 17:27 ` Andrey Shinkevich
2020-10-07 17:39 ` Andrey Shinkevich
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=c75c215d-ab8f-4147-5c5c-0b8b56868638@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=andrey.shinkevich@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).