From nobody Wed Dec 17 05:37:09 2025 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=1626794334; cv=none; d=zohomail.com; s=zohoarc; b=lsUZ+clRQJqddTqh5zUI0411d+7AKaiPomjYzMs8cc4pyi2K1PSYTZzHw44hTwqex60tf7E88JbRhpCHlwjQqrVQQiS7q3GzVQpZD7ZbeU0xsKJy80rGCPF7ogRhysbq+a7Z4cQ/tPmTkr03drnN0qFbScZsBJkYLM2Kg4MUDuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626794334; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RWY+RF9EkwmX9Q2KkJswkXq2dhfFbv2ZETeYn1O3dDA=; b=AX/RLwlaC+qTwcOgLYi8hPJlBjGL6ZXtc8RDNyLUtHrFZf2+JUf+Pft4Cgu7rEPlryzZzGfsV/ODukdSGgm+l3mc8FHkN0ibx/a0D4uqYk9dl7uRjkeO6NayvUnXYND5a+Guf2gwL/9iVXKFHz9BJ1KGfLheuDYQaNt1aT0tnws= 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 1626794334514305.2553306258104; Tue, 20 Jul 2021 08:18:54 -0700 (PDT) Received: from localhost ([::1]:38372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5rWH-0000eg-1o for importer@patchew.org; Tue, 20 Jul 2021 11:18:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5rPM-0003ms-Nr for qemu-devel@nongnu.org; Tue, 20 Jul 2021 11:11:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5rPJ-0001Ep-PY for qemu-devel@nongnu.org; Tue, 20 Jul 2021 11:11:44 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-3aw4-QcnPpW9xuDM5pFZ3A-1; Tue, 20 Jul 2021 11:11:37 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4686D804162; Tue, 20 Jul 2021 15:11:13 +0000 (UTC) Received: from merkur.redhat.com (ovpn-113-81.ams2.redhat.com [10.36.113.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5142C60843; Tue, 20 Jul 2021 15:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626793899; 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=RWY+RF9EkwmX9Q2KkJswkXq2dhfFbv2ZETeYn1O3dDA=; b=XAARkFcbot2B3LmVLaT2yzbphsVi+5NEckdbmHCKA24kBDd9GyrgxKWIqAQ9Q6UgKt8uaR NqwZxThhZMMoNZTMc3Vhq0zFmGvw1JVaYdfriyI5a1OEoI3Ql/cqoEvcg9tJLKnjTlABdP Zd9XcD0pQu5WgIqMi69MgUUwBzl/oUY= X-MC-Unique: 3aw4-QcnPpW9xuDM5pFZ3A-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 09/11] block/vvfat: fix: drop backing Date: Tue, 20 Jul 2021 17:10:51 +0200 Message-Id: <20210720151053.226144-10-kwolf@redhat.com> In-Reply-To: <20210720151053.226144-1-kwolf@redhat.com> References: <20210720151053.226144-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.474, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626794336495100003 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Most probably this fake backing child doesn't work anyway (see notes about it in a8a4d15c1c34d). Still, since 25f78d9e2de528473d52 drivers are required to set .supports_backing if they want to call bdrv_set_backing_hd, so now vvfat just doesn't work because of this check. Let's finally drop this fake backing file. Fixes: 25f78d9e2de528473d52acfcf7acdfb64e3453d4 Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20210715124853.13335-1-vsementsov@virtuozzo.com> Tested-by: John Arbuckle Signed-off-by: Kevin Wolf --- block/vvfat.c | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index ae9d387da7..34bf1e3a86 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -3098,26 +3098,6 @@ static int coroutine_fn vvfat_co_block_status(BlockD= riverState *bs, return BDRV_BLOCK_DATA; } =20 -static int coroutine_fn -write_target_commit(BlockDriverState *bs, uint64_t offset, uint64_t bytes, - QEMUIOVector *qiov, int flags) -{ - int ret; - - BDRVVVFATState* s =3D *((BDRVVVFATState**) bs->opaque); - qemu_co_mutex_lock(&s->lock); - ret =3D try_commit(s); - qemu_co_mutex_unlock(&s->lock); - - return ret; -} - -static BlockDriver vvfat_write_target =3D { - .format_name =3D "vvfat_write_target", - .instance_size =3D sizeof(void*), - .bdrv_co_pwritev =3D write_target_commit, -}; - static void vvfat_qcow_options(BdrvChildRole role, bool parent_is_format, int *child_flags, QDict *child_options, int parent_flags, QDict *parent_options) @@ -3133,7 +3113,6 @@ static int enable_write_target(BlockDriverState *bs, = Error **errp) { BDRVVVFATState *s =3D bs->opaque; BlockDriver *bdrv_qcow =3D NULL; - BlockDriverState *backing; QemuOpts *opts =3D NULL; int ret; int size =3D sector2cluster(s, s->sector_count); @@ -3184,13 +3163,6 @@ static int enable_write_target(BlockDriverState *bs,= Error **errp) unlink(s->qcow_filename); #endif =20 - backing =3D bdrv_new_open_driver(&vvfat_write_target, NULL, BDRV_O_ALL= OW_RDWR, - &error_abort); - *(void**) backing->opaque =3D s; - - bdrv_set_backing_hd(s->bs, backing, &error_abort); - bdrv_unref(backing); - return 0; =20 err: @@ -3205,17 +3177,10 @@ static void vvfat_child_perm(BlockDriverState *bs, = BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { - if (role & BDRV_CHILD_DATA) { - /* This is a private node, nobody should try to attach to it */ - *nperm =3D BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE; - *nshared =3D BLK_PERM_WRITE_UNCHANGED; - } else { - assert(role & BDRV_CHILD_COW); - /* The backing file is there so 'commit' can use it. vvfat doesn't - * access it in any way. */ - *nperm =3D 0; - *nshared =3D BLK_PERM_ALL; - } + assert(role & BDRV_CHILD_DATA); + /* This is a private node, nobody should try to attach to it */ + *nperm =3D BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE; + *nshared =3D BLK_PERM_WRITE_UNCHANGED; } =20 static void vvfat_close(BlockDriverState *bs) --=20 2.31.1