From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: Max Reitz <mreitz@redhat.com>,
Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>,
qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, kwolf@redhat.com, fam@euphon.net,
stefanha@redhat.com, armbru@redhat.com, jsnow@redhat.com,
libvir-list@redhat.com, eblake@redhat.com, den@openvz.org
Subject: Re: [PATCH v11 10/13] stream: skip filters when writing backing file name to QCOW2 header
Date: Wed, 14 Oct 2020 18:40:03 +0300 [thread overview]
Message-ID: <ad827283-c9a0-74f3-2e04-8fa8d37e2dd9@virtuozzo.com> (raw)
In-Reply-To: <582fb55d-0d3f-8a16-2134-67d73643da9e@redhat.com>
14.10.2020 18:02, Max Reitz wrote:
> On 12.10.20 19:43, 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..51462bd 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_unfiltered = bdrv_skip_filters(base);
>> 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;
>> - if (base->drv) {
>> - base_fmt = base->drv->format_name;
>> + if (base_unfiltered) {
>> + base_id = base_unfiltered->filename;
>
> I think you have to leave this querying s->backing_file_str, and instead
> change how qmp_block_stream() gets @base_name. block-stream has a
> backing-file parameter that can override the string that should be used
> here.
>
> (Or perhaps you can let qmp_block_stream() just set it to NULL if no
> backing-file parameter is passed and then fall back to
> base_unfiltered->filename only here. Probably better, actually, in case
> base_unfiltered is changed during the job run.)
>
Agree with the way in brackets.
If user set backing-file parameter we should handle it here.
If backing-file is not set, we should use dynamically calculated unfiltered base in stream_prepare().
--
Best regards,
Vladimir
next prev parent reply other threads:[~2020-10-14 15:42 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 17:43 [PATCH v11 00/13] Apply COR-filter to the block-stream permanently Andrey Shinkevich via
2020-10-12 17:43 ` [PATCH v11 01/13] copy-on-read: Support preadv/pwritev_part functions Andrey Shinkevich via
2020-10-12 17:43 ` [PATCH v11 02/13] copy-on-read: add filter append/drop functions Andrey Shinkevich via
2020-10-14 10:44 ` Max Reitz
2020-10-14 14:28 ` Andrey Shinkevich
2020-10-14 16:26 ` Max Reitz
2020-10-12 17:43 ` [PATCH v11 03/13] qapi: add filter-node-name to block-stream Andrey Shinkevich via
2020-10-12 17:43 ` [PATCH v11 04/13] copy-on-read: pass overlay base node name to COR driver Andrey Shinkevich via
2020-10-14 11:09 ` Max Reitz
2020-10-14 11:57 ` Max Reitz
2020-10-14 14:56 ` Vladimir Sementsov-Ogievskiy
2020-10-14 16:27 ` Max Reitz
2020-10-14 16:08 ` Andrey Shinkevich
2020-10-14 16:18 ` Vladimir Sementsov-Ogievskiy
2020-10-14 16:36 ` Max Reitz
2020-10-12 17:43 ` [PATCH v11 05/13] copy-on-read: limit COR operations to base in " Andrey Shinkevich via
2020-10-14 11:59 ` Max Reitz
2020-10-14 17:43 ` Andrey Shinkevich
2020-10-14 12:01 ` Max Reitz
2020-10-14 18:57 ` Andrey Shinkevich
2020-10-15 15:56 ` Max Reitz
2020-10-15 17:37 ` Andrey Shinkevich
2020-10-16 14:28 ` Vladimir Sementsov-Ogievskiy
2020-10-12 17:43 ` [PATCH v11 06/13] block: modify the comment for BDRV_REQ_PREFETCH flag Andrey Shinkevich via
2020-10-14 12:22 ` Max Reitz
2020-10-14 15:04 ` Vladimir Sementsov-Ogievskiy
2020-10-14 19:57 ` Andrey Shinkevich
2020-10-12 17:43 ` [PATCH v11 07/13] block: include supported_read_flags into BDS structure Andrey Shinkevich via
2020-10-14 12:31 ` Max Reitz
2020-10-12 17:43 ` [PATCH v11 08/13] copy-on-read: add support for BDRV_REQ_PREFETCH to COR-filter Andrey Shinkevich via
2020-10-14 12:40 ` Max Reitz
2020-10-12 17:43 ` [PATCH v11 09/13] copy-on-read: skip non-guest reads if no copy needed Andrey Shinkevich via
2020-10-14 12:51 ` Max Reitz
2020-10-14 15:22 ` Vladimir Sementsov-Ogievskiy
2020-10-14 16:30 ` Max Reitz
2020-10-14 16:39 ` Vladimir Sementsov-Ogievskiy
2020-10-15 15:49 ` Max Reitz
2020-10-21 20:43 ` Andrey Shinkevich
2020-10-22 7:50 ` Andrey Shinkevich
2020-10-22 8:56 ` Vladimir Sementsov-Ogievskiy
2020-10-14 20:49 ` Andrey Shinkevich
2020-10-12 17:43 ` [PATCH v11 10/13] stream: skip filters when writing backing file name to QCOW2 header Andrey Shinkevich via
2020-10-14 15:02 ` Max Reitz
2020-10-14 15:40 ` Vladimir Sementsov-Ogievskiy [this message]
2020-10-12 17:43 ` [PATCH v11 11/13] stream: mark backing-file argument as deprecated Andrey Shinkevich via
2020-10-14 15:03 ` Max Reitz
2020-10-14 15:43 ` Vladimir Sementsov-Ogievskiy
2020-10-15 9:01 ` Andrey Shinkevich
2020-10-12 17:43 ` [PATCH v11 12/13] stream: remove unused backing-file name parameter Andrey Shinkevich via
2020-10-14 15:05 ` Max Reitz
2020-10-12 17:43 ` [PATCH v11 13/13] block: apply COR-filter to block-stream jobs Andrey Shinkevich via
2020-10-14 16:24 ` Max Reitz
2020-10-15 17:16 ` Andrey Shinkevich
2020-10-16 15:06 ` Andrey Shinkevich
2020-10-16 15:45 ` Vladimir Sementsov-Ogievskiy
2020-10-20 19:43 ` 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=ad827283-c9a0-74f3-2e04-8fa8d37e2dd9@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=libvir-list@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).