From patchwork Mon Feb 5 15:18:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 10200833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 266BF60247 for ; Mon, 5 Feb 2018 15:48:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16892286DC for ; Mon, 5 Feb 2018 15:48:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AEFB28782; Mon, 5 Feb 2018 15:48:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0B41B286DC for ; Mon, 5 Feb 2018 15:48:02 +0000 (UTC) Received: from localhost ([::1]:55475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiizw-00085K-V8 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Feb 2018 10:48:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiiXp-00083h-Gc for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:18:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eiiXn-0005Vl-PG for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:18:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38093) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eiiXk-0005Kg-Pv; Mon, 05 Feb 2018 10:18:52 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0EF6B776C6; Mon, 5 Feb 2018 15:18:52 +0000 (UTC) Received: from localhost (unknown [10.40.205.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82A285EDEA; Mon, 5 Feb 2018 15:18:51 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 5 Feb 2018 16:18:12 +0100 Message-Id: <20180205151835.20812-4-mreitz@redhat.com> In-Reply-To: <20180205151835.20812-1-mreitz@redhat.com> References: <20180205151835.20812-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 05 Feb 2018 15:18:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v8 03/26] block: Add BDS.backing_overridden X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If the backing file is overridden, this most probably does change the guest-visible data of a BDS. Therefore, we will need to consider this in bdrv_refresh_filename(). Adding a new field to the BDS is not nice, but it is very simple and exactly keeps track of whether the backing file has been overridden. This commit adds a FIXME which will be remedied by a follow-up commit. Until then, the respective piece of code will not result in any behavior that is worse than what we currently have. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- include/block/block_int.h | 1 + block.c | 13 +++++++++++++ block/mirror.c | 4 ++++ blockdev.c | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/include/block/block_int.h b/include/block/block_int.h index 29cafa4236..b5c124fcbd 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -619,6 +619,7 @@ struct BlockDriverState { char backing_file[PATH_MAX]; /* if non zero, the image is a diff of this file image */ char backing_format[16]; /* if non-zero and backing_file exists */ + bool backing_overridden; /* backing file has been specified by the user */ QDict *full_open_options; char exact_filename[PATH_MAX]; diff --git a/block.c b/block.c index b84aba2d95..66e37219b9 100644 --- a/block.c +++ b/block.c @@ -2268,6 +2268,11 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options, reference = qdict_get_try_str(parent_options, bdref_key); if (reference || qdict_haskey(options, "file.filename")) { backing_filename[0] = '\0'; + + /* FIXME: Should also be set to true if @options contains other runtime + * options which control the data that is read from the backing + * BDS */ + bs->backing_overridden = true; } else if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) { QDECREF(options); goto free_exit; @@ -2469,6 +2474,9 @@ static BlockDriverState *bdrv_append_temp_snapshot(BlockDriverState *bs, goto out; } + bs_snapshot->backing_overridden = true; + bdrv_refresh_filename(bs_snapshot); + out: QDECREF(snapshot_options); g_free(tmp_filename); @@ -2599,6 +2607,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, backing = qdict_get_try_str(options, "backing"); if (backing && *backing == '\0') { flags |= BDRV_O_NO_BACKING; + bs->backing_overridden = true; qdict_del(options, "backing"); } @@ -5031,6 +5040,10 @@ void bdrv_refresh_filename(BlockDriverState *bs) * refresh those first */ QLIST_FOREACH(child, &bs->children, next) { bdrv_refresh_filename(child->bs); + + if (child->role == &child_backing && child->bs->backing_overridden) { + bs->backing_overridden = true; + } } if (drv->bdrv_refresh_filename) { diff --git a/block/mirror.c b/block/mirror.c index 5a627ba589..aa68531352 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -530,6 +530,10 @@ static void mirror_exit(BlockJob *job, void *opaque) error_report_err(local_err); data->ret = -EPERM; } + + /* The target image's file already has been created with the backing + * file we just set, so there is no need to set backing_overridden or + * call bdrv_refresh_filename(). */ } if (s->to_replace) { diff --git a/blockdev.c b/blockdev.c index 8e977eef11..bbe264c3c0 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1795,6 +1795,8 @@ static void external_snapshot_commit(BlkActionState *common) { ExternalSnapshotState *state = DO_UPCAST(ExternalSnapshotState, common, common); + TransactionAction *action = common->action; + bool image_was_existing = false; AioContext *aio_context; aio_context = bdrv_get_aio_context(state->old_bs); @@ -1808,6 +1810,20 @@ static void external_snapshot_commit(BlkActionState *common) NULL); } + if (action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC) { + BlockdevSnapshotSync *s = action->u.blockdev_snapshot_sync.data; + if (s->has_mode && s->mode == NEW_IMAGE_MODE_EXISTING) { + image_was_existing = true; + } + } else { + image_was_existing = true; + } + + if (image_was_existing) { + state->new_bs->backing_overridden = true; + bdrv_refresh_filename(state->new_bs); + } + aio_context_release(aio_context); }