qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, eblake@redhat.com, armbru@redhat.com,
	crosa@redhat.com, ehabkost@redhat.com, berrange@redhat.com,
	pbonzini@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,
	mreitz@redhat.com, kwolf@redhat.com, den@openvz.org
Subject: [PATCH v2 17/33] block/copy-before-write: cbw_init(): use file child after attaching
Date: Thu, 20 May 2021 17:21:49 +0300	[thread overview]
Message-ID: <20210520142205.607501-18-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210520142205.607501-1-vsementsov@virtuozzo.com>

In the next commit we'll get rid of source argument of cbw_init().
Prepare to it now, to make next commit simpler: move the code block
that uses source below attaching the child and use bs->file->bs instead
of source variable.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 block/copy-before-write.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index d7f1833efa..4858dcf8ff 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -149,13 +149,6 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
 {
     BDRVCopyBeforeWriteState *s = bs->opaque;
 
-    bs->total_sectors = source->total_sectors;
-    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
-            (BDRV_REQ_FUA & source->supported_write_flags);
-    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
-            ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
-             source->supported_zero_flags);
-
     bdrv_ref(target);
     s->target = bdrv_attach_child(bs, target, "target", &child_of_bds,
                                   BDRV_CHILD_DATA, errp);
@@ -173,6 +166,13 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
         return -EINVAL;
     }
 
+    bs->total_sectors = bs->file->bs->total_sectors;
+    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
+            (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);
+    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
+            ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
+             bs->file->bs->supported_zero_flags);
+
     s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp);
     if (!s->bcs) {
         error_prepend(errp, "Cannot create block-copy-state: ");
-- 
2.29.2



  parent reply	other threads:[~2021-05-20 14:34 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-20 14:21 [PATCH v2 00/33] block: publish backup-top filter Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` [PATCH v2 01/33] block: rename bdrv_replace_child to bdrv_replace_child_tran Vladimir Sementsov-Ogievskiy
2021-05-31 12:52   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 02/33] block: comment graph-modifying function not updating permissions Vladimir Sementsov-Ogievskiy
2021-05-31 12:56   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 03/33] block: introduce bdrv_replace_child_bs() Vladimir Sementsov-Ogievskiy
2021-05-31 14:18   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 04/33] block: introduce blk_replace_bs Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` [PATCH v2 05/33] qdev-properties: PropertyInfo: add realized_set_allowed field Vladimir Sementsov-Ogievskiy
2021-05-31 15:51   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 06/33] qdev: allow setting drive property for realized device Vladimir Sementsov-Ogievskiy
2021-05-31 15:59   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 07/33] block: rename backup-top to copy-before-write Vladimir Sementsov-Ogievskiy
2021-05-31 16:08   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 08/33] block/backup: drop support for copy_range Vladimir Sementsov-Ogievskiy
2021-05-28 15:29   ` Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` [PATCH v2 09/33] block-copy: always set BDRV_REQ_SERIALISING flag Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` [PATCH v2 10/33] block/backup: move cluster size calculation to block-copy Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` [PATCH v2 11/33] block/copy-before-write: relax permission requirements when no parents Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` [PATCH v2 12/33] block/copy-before-write: drop extra bdrv_unref on failure path Vladimir Sementsov-Ogievskiy
2021-05-31 16:19   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 13/33] block/copy-before-write: use file child instead of backing Vladimir Sementsov-Ogievskiy
2021-05-31 16:22   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 14/33] block/copy-before-write: bdrv_cbw_append(): replace child at last Vladimir Sementsov-Ogievskiy
2021-05-31 16:55   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 15/33] block/copy-before-write: introduce cbw_init() Vladimir Sementsov-Ogievskiy
2021-05-31 16:57   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 16/33] block/copy-before-write: cbw_init(): rename variables Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` Vladimir Sementsov-Ogievskiy [this message]
2021-05-20 14:21 ` [PATCH v2 18/33] block/copy-before-write: cbw_init(): use options Vladimir Sementsov-Ogievskiy
2021-05-31 17:03   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 19/33] block/copy-before-write: initialize block-copy bitmap Vladimir Sementsov-Ogievskiy
2021-05-31 17:10   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 20/33] block/block-copy: make setting progress optional Vladimir Sementsov-Ogievskiy
2021-08-10 15:22   ` Hanna Reitz
2021-05-20 14:21 ` [PATCH v2 21/33] block/copy-before-write: make public block driver Vladimir Sementsov-Ogievskiy
2021-05-20 14:21 ` [PATCH v2 22/33] qapi: publish copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-06-01  9:08   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 23/33] python/qemu/machine.py: refactor _qemu_args() Vladimir Sementsov-Ogievskiy
2021-06-01 10:05   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 24/33] python/qemu/machine: QEMUMachine: improve qmp() method Vladimir Sementsov-Ogievskiy
2021-06-01 10:19   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 25/33] iotests.py: VM: add own __enter__ method Vladimir Sementsov-Ogievskiy
2021-06-01 10:58   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 26/33] iotests/222: fix pylint and mypy complains Vladimir Sementsov-Ogievskiy
2021-06-01 11:16   ` Max Reitz
2021-05-20 14:21 ` [PATCH v2 27/33] iotests/222: constantly use single quotes for strings Vladimir Sementsov-Ogievskiy
2021-06-01 11:17   ` Max Reitz
2021-05-20 14:22 ` [PATCH v2 28/33] iotests: move 222 to tests/image-fleecing Vladimir Sementsov-Ogievskiy
2021-06-01 11:17   ` Max Reitz
2021-05-20 14:22 ` [PATCH v2 29/33] iotests.py: hmp_qemu_io: support qdev Vladimir Sementsov-Ogievskiy
2021-06-01 11:19   ` Max Reitz
2021-05-20 14:22 ` [PATCH v2 30/33] iotests/image-fleecing: proper source device Vladimir Sementsov-Ogievskiy
2021-06-01 11:29   ` Max Reitz
2021-05-20 14:22 ` [PATCH v2 31/33] iotests/image-fleecing: rename tgt_node Vladimir Sementsov-Ogievskiy
2021-06-01 11:46   ` Max Reitz
2021-05-20 14:22 ` [PATCH v2 32/33] iotests/image-fleecing: prepare for adding new test-case Vladimir Sementsov-Ogievskiy
2021-06-01 11:47   ` Max Reitz
2021-05-20 14:22 ` [PATCH v2 33/33] iotests/image-fleecing: add test-case for copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-06-01 12:02   ` Max Reitz
2021-05-31 17:11 ` [PATCH v2 00/33] block: publish backup-top filter Max Reitz
2021-05-31 17:35   ` Vladimir Sementsov-Ogievskiy

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=20210520142205.607501-18-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=den@openvz.org \
    --cc=eblake@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@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: 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).