From nobody Wed Nov 27 04:37:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1701360433; cv=none; d=zohomail.com; s=zohoarc; b=CWpUmjdvEi6Mxyw5cNVlk7zI0wWDFWJDJmivM8D8yRVkn3tZ39lv/+ZeEmzAoamfnP+4MpiJ65kc3+VDf3/ZJvkApNdT5whv4lh6pfjjmNOcBwJSfBJOYdu17t2zSla+mp9nW1Bisv4n+59IErVpIzw4yLWIEIb+WhtFDWHm+oU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701360433; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wmAmNaYmhheOWok89PZGyKaVO40uuHecJDXEyTIX7gg=; b=mPjjltyH9pm4jqsB8GzQ00YmZ5r9yMsar+RN/VvnoZLrZgajDBkmaU5KeHW1rnjdRArY6xL0NOnslDDohrDAbxQAMG27lS10c2koDtmT6R9vYJwJV6n4Q+Yop33gefsa0c02p/UGD/oQRgsCwJ6UZLFM+RbmwJyoGqJ/cRzrMNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701360433038888.3491166612304; Thu, 30 Nov 2023 08:07:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8jYO-0007Yf-Ho; Thu, 30 Nov 2023 11:06:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8jYN-0007W2-5X for qemu-devel@nongnu.org; Thu, 30 Nov 2023 11:06:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8jYK-0002ki-5h for qemu-devel@nongnu.org; Thu, 30 Nov 2023 11:06:14 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-526-NIfV3WtePoW_nnvVctpuuA-1; Thu, 30 Nov 2023 11:06:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5B4902815E2C; Thu, 30 Nov 2023 16:06:09 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6DB4310F44; Thu, 30 Nov 2023 16:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701360371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wmAmNaYmhheOWok89PZGyKaVO40uuHecJDXEyTIX7gg=; b=FoTHAUsTYLjbbaN/Xl/mIO8UI7/QXTgui+r/Bz8nF4Jol74/FpV1gzchFBIA1DGugw5tDV QhMUVfYRV1AritsndFM+N8DzkJsyUPkJS+HKfPTQVdHP9MDbkt+j8+kPMjD7m6FjB/7y/V JElAERLDRjGU/NQJBw36KbBqBnBX04U= X-MC-Unique: NIfV3WtePoW_nnvVctpuuA-1 From: Peter Krempa To: qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , John Snow , Vladimir Sementsov-Ogievskiy , Eric Blake , Markus Armbruster , qemu-block@nongnu.org Subject: [PATCH v2 1/2] block: commit: Allow users to request only format driver names in backing file format Date: Thu, 30 Nov 2023 17:06:03 +0100 Message-ID: <2062cb544eab1a3ac785de65fd8c9b2a3f0265dc.1701360249.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pkrempa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1701360435157000006 Content-Type: text/plain; charset="utf-8" Introduce a new flag 'backing_file_format_no_protocol' for the block-commit QMP command which instructs the internals to use 'raw' instead of the protocol driver in case when a image is used without a dummy 'raw' wrapper. The flag is designed such that it can be always asserted by management tools even when there isn't any update to backing files. The flag will be used by libvirt so that the backing images still reference the proper format even when libvirt will stop using the dummy raw driver (raw driver with no other config). Libvirt needs this so that the images stay compatible with older libvirt versions which didn't expect that a protocol driver name can appear in the backing file format field. Signed-off-by: Peter Krempa Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 37 +++++++++++++++++++++----- block/commit.c | 6 ++++- blockdev.c | 6 +++++ include/block/block-global-state.h | 3 ++- include/block/block_int-common.h | 4 ++- include/block/block_int-global-state.h | 3 +++ qapi/block-core.json | 11 +++++++- tests/unit/test-bdrv-drain.c | 3 ++- 8 files changed, 61 insertions(+), 12 deletions(-) diff --git a/block.c b/block.c index bfb0861ec6..986a529941 100644 --- a/block.c +++ b/block.c @@ -1309,11 +1309,14 @@ static void bdrv_backing_detach(BdrvChild *c) } static int bdrv_backing_update_filename(BdrvChild *c, BlockDriverState *ba= se, - const char *filename, Error **errp) + const char *filename, + bool backing_file_format_no_protoc= ol, + Error **errp) { BlockDriverState *parent =3D c->opaque; bool read_only =3D bdrv_is_read_only(parent); int ret; + const char *format_name; GLOBAL_STATE_CODE(); if (read_only) { @@ -1323,9 +1326,23 @@ static int bdrv_backing_update_filename(BdrvChild *c= , BlockDriverState *base, } } - ret =3D bdrv_change_backing_file(parent, filename, - base->drv ? base->drv->format_name : "", - false); + if (base->drv) { + /* + * If the new base image doesn't have a format driver layer, which= we + * detect by the fact that @base is a protocol driver, we record + * 'raw' as the format instead of putting the protocol name as the + * backing format + */ + if (backing_file_format_no_protocol && base->drv->protocol_name) { + format_name =3D "raw"; + } else { + format_name =3D base->drv->format_name; + } + } else { + format_name =3D ""; + } + + ret =3D bdrv_change_backing_file(parent, filename, format_name, false); if (ret < 0) { error_setg_errno(errp, -ret, "Could not update backing file link"); } @@ -1479,10 +1496,14 @@ static void GRAPH_WRLOCK bdrv_child_cb_detach(BdrvC= hild *child) } static int bdrv_child_cb_update_filename(BdrvChild *c, BlockDriverState *b= ase, - const char *filename, Error **err= p) + const char *filename, + bool backing_file_format_no_proto= col, + Error **errp) { if (c->role & BDRV_CHILD_COW) { - return bdrv_backing_update_filename(c, base, filename, errp); + return bdrv_backing_update_filename(c, base, filename, + backing_file_format_no_protoco= l, + errp); } return 0; } @@ -5961,7 +5982,8 @@ void bdrv_unfreeze_backing_chain(BlockDriverState *bs= , BlockDriverState *base) * */ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, - const char *backing_file_str) + const char *backing_file_str, + bool backing_file_format_no_protocol) { BlockDriverState *explicit_top =3D top; bool update_inherits_from; @@ -6027,6 +6049,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, Blo= ckDriverState *base, if (c->klass->update_filename) { ret =3D c->klass->update_filename(c, base, backing_file_str, + backing_file_format_no_protoco= l, &local_err); if (ret < 0) { /* diff --git a/block/commit.c b/block/commit.c index 69cc75be0c..5a584b712e 100644 --- a/block/commit.c +++ b/block/commit.c @@ -42,6 +42,7 @@ typedef struct CommitBlockJob { bool base_read_only; bool chain_frozen; char *backing_file_str; + bool backing_file_format_no_protocol; } CommitBlockJob; static int commit_prepare(Job *job) @@ -61,7 +62,8 @@ static int commit_prepare(Job *job) /* FIXME: bdrv_drop_intermediate treats total failures and partial fai= lures * identically. Further work is needed to disambiguate these cases. */ return bdrv_drop_intermediate(s->commit_top_bs, s->base_bs, - s->backing_file_str); + s->backing_file_str, + s->backing_file_format_no_protocol); } static void commit_abort(Job *job) @@ -254,6 +256,7 @@ void commit_start(const char *job_id, BlockDriverState = *bs, BlockDriverState *base, BlockDriverState *top, int creation_flags, int64_t speed, BlockdevOnError on_error, const char *backing_file_str, + bool backing_file_format_no_protocol, const char *filter_node_name, Error **errp) { CommitBlockJob *s; @@ -408,6 +411,7 @@ void commit_start(const char *job_id, BlockDriverState = *bs, blk_set_disable_request_queuing(s->top, true); s->backing_file_str =3D g_strdup(backing_file_str); + s->backing_file_format_no_protocol =3D backing_file_format_no_protocol; s->on_error =3D on_error; trace_commit_start(bs, base, top, s); diff --git a/blockdev.c b/blockdev.c index 4c1177e8db..038031bb03 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2555,6 +2555,8 @@ void qmp_block_commit(const char *job_id, const char = *device, const char *top_node, const char *top, const char *backing_file, + bool has_backing_file_format_no_protocol, + bool backing_file_format_no_protocol, bool has_speed, int64_t speed, bool has_on_error, BlockdevOnError on_error, const char *filter_node_name, @@ -2585,6 +2587,9 @@ void qmp_block_commit(const char *job_id, const char = *device, if (has_auto_dismiss && !auto_dismiss) { job_flags |=3D JOB_MANUAL_DISMISS; } + if (!has_backing_file_format_no_protocol) { + backing_file_format_no_protocol =3D false; + } /* Important Note: * libvirt relies on the DeviceNotFound error class in order to probe= for @@ -2727,6 +2732,7 @@ void qmp_block_commit(const char *job_id, const char = *device, } commit_start(job_id, bs, base_bs, top_bs, job_flags, speed, on_error, backing_file, + backing_file_format_no_protocol, filter_node_name, &local_err); } if (local_err !=3D NULL) { diff --git a/include/block/block-global-state.h b/include/block/block-globa= l-state.h index 6b21fbc73f..b7aec4cd30 100644 --- a/include/block/block-global-state.h +++ b/include/block/block-global-state.h @@ -145,7 +145,8 @@ int GRAPH_RDLOCK bdrv_make_empty(BdrvChild *c, Error **= errp); void bdrv_register(BlockDriver *bdrv); int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, - const char *backing_file_str); + const char *backing_file_str, + bool backing_file_format_no_protocol); BlockDriverState * GRAPH_RDLOCK bdrv_find_overlay(BlockDriverState *active, BlockDriverState *bs); diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 4e31d161c5..e08204dec6 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -985,7 +985,9 @@ struct BdrvChildClass { * can update its reference. */ int (*update_filename)(BdrvChild *child, BlockDriverState *new_base, - const char *filename, Error **errp); + const char *filename, + bool backing_file_format_no_protocol, + Error **errp); bool (*change_aio_ctx)(BdrvChild *child, AioContext *ctx, GHashTable *visited, Transaction *tran, diff --git a/include/block/block_int-global-state.h b/include/block/block_i= nt-global-state.h index ef31c58bb3..4f253ff362 100644 --- a/include/block/block_int-global-state.h +++ b/include/block/block_int-global-state.h @@ -82,6 +82,8 @@ void stream_start(const char *job_id, BlockDriverState *b= s, * @speed: The maximum speed, in bytes per second, or 0 for unlimited. * @on_error: The action to take upon error. * @backing_file_str: String to use as the backing file in @top's overlay + * @backing_file_format_no_protocol: Use format name instead of potental + * protocol name as backing image format * @filter_node_name: The node name that should be assigned to the filter * driver that the commit job inserts into the graph above @top. NULL means * that a node name should be autogenerated. @@ -92,6 +94,7 @@ void commit_start(const char *job_id, BlockDriverState *b= s, BlockDriverState *base, BlockDriverState *top, int creation_flags, int64_t speed, BlockdevOnError on_error, const char *backing_file_str, + bool backing_file_format_no_protocol, const char *filter_node_name, Error **errp); /** * commit_active_start: diff --git a/qapi/block-core.json b/qapi/block-core.json index ca390c5700..d6b87f1bdd 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1810,6 +1810,14 @@ # Care should be taken when specifying the string, to specify a # valid filename or protocol. (Since 2.1) # +# @backing-file-format-no-protocol: If true always use a 'format' driver n= ame +# for the 'backing file format' field if updating the image header of = the +# overlay of 'top'. Otherwise the real name of the driver of the backi= ng +# image may be used which may be a protocol driver. +# +# Can be used also when no image header will be updated. +# (default: false; since: 9.0) +# # @speed: the maximum speed, in bytes per second # # @on-error: the action to take on an error. 'ignore' means that the @@ -1856,7 +1864,8 @@ '*base': { 'type': 'str', 'features': [ 'deprecated' ] }, '*top-node': 'str', '*top': { 'type': 'str', 'features': [ 'deprecated' ] }, - '*backing-file': 'str', '*speed': 'int', + '*backing-file': 'str', '*backing-file-format-no-protocol': 'b= ool', + '*speed': 'int', '*on-error': 'BlockdevOnError', '*filter-node-name': 'str', '*auto-finalize': 'bool', '*auto-dismiss': 'bool' }, diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c index 704d1a3f36..422f0c7cd8 100644 --- a/tests/unit/test-bdrv-drain.c +++ b/tests/unit/test-bdrv-drain.c @@ -1638,6 +1638,7 @@ static const BlockJobDriver test_simple_job_driver = =3D { static int drop_intermediate_poll_update_filename(BdrvChild *child, BlockDriverState *new_ba= se, const char *filename, + bool backing_file_format= _no_protocol, Error **errp) { /* @@ -1749,7 +1750,7 @@ static void test_drop_intermediate_poll(void) job->should_complete =3D true; g_assert(!job_has_completed); - ret =3D bdrv_drop_intermediate(chain[1], chain[0], NULL); + ret =3D bdrv_drop_intermediate(chain[1], chain[0], NULL, false); aio_poll(qemu_get_aio_context(), false); g_assert(ret =3D=3D 0); g_assert(job_has_completed); --=20 2.43.0