From: Max Reitz <mreitz@redhat.com> To: qemu-block@nongnu.org Cc: Kevin Wolf <kwolf@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>, qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 26/42] backup: Deal with filters Date: Fri, 9 Aug 2019 18:13:51 +0200 Message-ID: <20190809161407.11920-27-mreitz@redhat.com> (raw) In-Reply-To: <20190809161407.11920-1-mreitz@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- block/backup.c | 9 +++++---- blockdev.c | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/block/backup.c b/block/backup.c index ecadb61af3..7854d7575b 100644 --- a/block/backup.c +++ b/block/backup.c @@ -611,6 +611,7 @@ static int64_t backup_calculate_cluster_size(BlockDriverState *target, { int ret; BlockDriverInfo bdi; + bool target_does_cow = bdrv_backing_chain_next(target); /* * If there is no backing file on the target, we cannot rely on COW if our @@ -618,7 +619,7 @@ static int64_t backup_calculate_cluster_size(BlockDriverState *target, * targets with a backing file, try to avoid COW if possible. */ ret = bdrv_get_info(target, &bdi); - if (ret == -ENOTSUP && !target->backing) { + if (ret == -ENOTSUP && !target_does_cow) { /* Cluster size is not defined */ warn_report("The target block device doesn't provide " "information about the block size and it doesn't have a " @@ -627,14 +628,14 @@ static int64_t backup_calculate_cluster_size(BlockDriverState *target, "this default, the backup may be unusable", BACKUP_CLUSTER_SIZE_DEFAULT); return BACKUP_CLUSTER_SIZE_DEFAULT; - } else if (ret < 0 && !target->backing) { + } else if (ret < 0 && !target_does_cow) { error_setg_errno(errp, -ret, "Couldn't determine the cluster size of the target image, " "which has no backing file"); error_append_hint(errp, "Aborting, since this may create an unusable destination image\n"); return ret; - } else if (ret < 0 && target->backing) { + } else if (ret < 0 && target_does_cow) { /* Not fatal; just trudge on ahead. */ return BACKUP_CLUSTER_SIZE_DEFAULT; } @@ -683,7 +684,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, return NULL; } - if (compress && target->drv->bdrv_co_pwritev_compressed == NULL) { + if (compress && !bdrv_supports_compressed_writes(target)) { error_setg(errp, "Compression is not supported for this drive %s", bdrv_get_device_name(target)); return NULL; diff --git a/blockdev.c b/blockdev.c index c451f553f7..c6f79b4e0e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3656,7 +3656,13 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn, /* See if we have a backing HD we can use to create our new image * on top of. */ if (backup->sync == MIRROR_SYNC_MODE_TOP) { - source = backing_bs(bs); + /* + * Backup will not replace the source by the target, so none + * of the filters skipped here will be removed (in contrast to + * mirror). Therefore, we can skip all of them when looking + * for the first COW relationship. + */ + source = bdrv_filtered_cow_bs(bdrv_skip_rw_filters(bs)); if (!source) { backup->sync = MIRROR_SYNC_MODE_FULL; } @@ -3676,9 +3682,14 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn, if (backup->mode != NEW_IMAGE_MODE_EXISTING) { assert(backup->format); if (source) { - bdrv_refresh_filename(source); - bdrv_img_create(backup->target, backup->format, source->filename, - source->drv->format_name, NULL, + /* Implicit filters should not appear in the filename */ + BlockDriverState *explicit_backing = + bdrv_skip_implicit_filters(source); + + bdrv_refresh_filename(explicit_backing); + bdrv_img_create(backup->target, backup->format, + explicit_backing->filename, + explicit_backing->drv->format_name, NULL, size, flags, false, &local_err); } else { bdrv_img_create(backup->target, backup->format, NULL, NULL, NULL, -- 2.21.0
next prev parent reply index Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 16:13 [Qemu-devel] [PATCH v6 00/42] block: " Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 01/42] block: Mark commit and mirror as filter drivers Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 02/42] copy-on-read: Support compressed writes Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 03/42] throttle: " Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 04/42] block: Add child access functions Max Reitz 2019-08-09 16:56 ` Eric Blake 2019-09-04 16:16 ` Kevin Wolf 2019-09-09 7:56 ` Max Reitz 2019-09-09 9:36 ` Kevin Wolf 2019-09-09 14:04 ` Max Reitz 2019-09-09 16:13 ` Kevin Wolf 2019-09-10 9:14 ` Max Reitz 2019-09-10 10:47 ` Kevin Wolf 2019-09-10 11:36 ` Max Reitz 2019-09-10 12:48 ` Kevin Wolf 2019-09-10 12:59 ` Max Reitz 2019-09-10 13:10 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 05/42] block: Add chain helper functions Max Reitz 2019-08-09 17:01 ` Eric Blake 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 06/42] qcow2: Implement .bdrv_storage_child() Max Reitz 2019-08-09 17:07 ` Eric Blake 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 07/42] block: *filtered_cow_child() for *has_zero_init() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 08/42] block: bdrv_set_backing_hd() is about bs->backing Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 09/42] block: Include filters when freezing backing chain Max Reitz 2019-08-10 13:32 ` Vladimir Sementsov-Ogievskiy 2019-08-12 12:56 ` Max Reitz 2019-09-05 13:05 ` Kevin Wolf 2019-09-09 8:02 ` Max Reitz 2019-09-09 9:40 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 10/42] block: Drop bdrv_is_encrypted() Max Reitz 2019-08-10 13:42 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 11/42] block: Add bdrv_supports_compressed_writes() Max Reitz 2019-09-05 13:11 ` Kevin Wolf 2019-09-09 8:09 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 12/42] block: Use bdrv_filtered_rw* where obvious Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 13/42] block: Use CAFs in block status functions Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 14/42] block: Use CAFs when working with backing chains Max Reitz 2019-08-10 15:19 ` Vladimir Sementsov-Ogievskiy 2019-09-05 14:05 ` Kevin Wolf 2019-09-09 8:25 ` Max Reitz 2019-09-09 9:55 ` Kevin Wolf 2019-09-09 14:08 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 15/42] block: Re-evaluate backing file handling in reopen Max Reitz 2019-08-10 16:05 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 16/42] block: Flush all children in generic code Max Reitz 2019-08-10 15:36 ` Vladimir Sementsov-Ogievskiy 2019-08-12 12:58 ` Max Reitz 2019-09-05 16:24 ` Kevin Wolf 2019-09-09 8:31 ` Max Reitz 2019-09-09 10:01 ` Kevin Wolf 2019-09-09 14:15 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 17/42] block: Use CAFs in bdrv_refresh_limits() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 18/42] block: Use CAFs in bdrv_refresh_filename() Max Reitz 2019-08-10 16:22 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 19/42] block: Use CAF in bdrv_co_rw_vmstate() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 20/42] block/snapshot: Fix fallback Max Reitz 2019-08-10 16:34 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:06 ` Max Reitz 2019-09-10 11:56 ` Kevin Wolf 2019-09-10 12:04 ` Max Reitz 2019-09-10 12:49 ` Kevin Wolf 2019-09-10 13:06 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 21/42] block: Use CAFs for debug breakpoints Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 22/42] block: Fix bdrv_get_allocated_file_size's fallback Max Reitz 2019-08-10 16:41 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:09 ` Max Reitz 2019-08-12 17:14 ` Vladimir Sementsov-Ogievskiy 2019-08-12 19:15 ` Max Reitz 2019-09-10 14:52 ` Kevin Wolf 2019-09-11 6:20 ` Max Reitz 2019-09-11 6:55 ` Kevin Wolf 2019-09-11 7:37 ` Max Reitz 2019-09-11 8:27 ` Kevin Wolf 2019-09-11 10:00 ` Max Reitz 2019-09-11 10:31 ` Kevin Wolf 2019-09-11 11:00 ` Max Reitz 2019-09-12 10:34 ` Kevin Wolf 2019-11-14 13:11 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 23/42] blockdev: Use CAF in external_snapshot_prepare() Max Reitz 2019-09-10 15:02 ` Kevin Wolf 2019-09-11 6:21 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 24/42] block: Use child access functions for QAPI queries Max Reitz 2019-08-10 16:57 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 25/42] mirror: Deal with filters Max Reitz 2019-08-12 11:09 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:26 ` Max Reitz 2019-08-14 15:17 ` Vladimir Sementsov-Ogievskiy 2019-08-31 9:57 ` Vladimir Sementsov-Ogievskiy 2019-09-02 14:35 ` Max Reitz 2019-09-03 8:32 ` Vladimir Sementsov-Ogievskiy 2019-09-09 7:41 ` Max Reitz 2019-09-13 12:55 ` Kevin Wolf 2019-09-16 10:26 ` Max Reitz 2019-08-09 16:13 ` Max Reitz [this message] 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 27/42] commit: " Max Reitz 2019-08-31 10:44 ` Vladimir Sementsov-Ogievskiy 2019-09-02 14:55 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 28/42] stream: " Max Reitz 2019-08-12 11:55 ` Vladimir Sementsov-Ogievskiy 2019-09-13 14:16 ` Kevin Wolf 2019-09-16 9:52 ` Max Reitz 2019-09-16 14:47 ` Kevin Wolf 2019-12-11 12:52 ` Max Reitz 2019-12-11 15:52 ` Kevin Wolf 2019-12-11 16:12 ` Max Reitz 2019-12-11 16:35 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 29/42] nbd: Use CAF when looking for dirty bitmap Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 30/42] qemu-img: Use child access functions Max Reitz 2019-08-12 12:14 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:28 ` Max Reitz 2019-08-14 16:04 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 31/42] block: Drop backing_bs() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 32/42] block: Make bdrv_get_cumulative_perm() public Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 33/42] blockdev: Fix active commit choice Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 34/42] block: Inline bdrv_co_block_status_from_*() Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 35/42] block: Fix check_to_replace_node() Max Reitz 2019-08-15 15:21 ` Vladimir Sementsov-Ogievskiy 2019-08-15 17:01 ` Max Reitz 2019-08-16 11:01 ` Vladimir Sementsov-Ogievskiy 2019-08-16 13:30 ` Max Reitz 2019-08-16 14:24 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 36/42] iotests: Add tests for mirror @replaces loops Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 37/42] block: Leave BDS.backing_file constant Max Reitz 2019-08-16 16:16 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 38/42] iotests: Let complete_and_wait() work with commit Max Reitz 2019-08-23 5:59 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 39/42] iotests: Add filter commit test cases Max Reitz 2019-08-31 11:41 ` Vladimir Sementsov-Ogievskiy 2019-09-02 15:06 ` Max Reitz 2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy 2019-09-02 15:09 ` Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 40/42] iotests: Add filter mirror " Max Reitz 2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 41/42] iotests: Add test for commit in sub directory Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 42/42] iotests: Test committing to overridden backing Max Reitz 2019-09-03 9:18 ` Vladimir Sementsov-Ogievskiy
Reply instructions: You may reply publically 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=20190809161407.11920-27-mreitz@redhat.com \ --to=mreitz@redhat.com \ --cc=kwolf@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=vsementsov@virtuozzo.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
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git