From nobody Fri Nov 7 13:05:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547739422849602.07098352013; Thu, 17 Jan 2019 07:37:02 -0800 (PST) Received: from localhost ([127.0.0.1]:46715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk9j3-0003Qq-OU for importer@patchew.org; Thu, 17 Jan 2019 10:37:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk9gn-0001s4-9a for qemu-devel@nongnu.org; Thu, 17 Jan 2019 10:34:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gk9gh-0007bk-Kj for qemu-devel@nongnu.org; Thu, 17 Jan 2019 10:34:41 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:59818) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gk9gg-0007Io-IJ; Thu, 17 Jan 2019 10:34:35 -0500 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gk9gY-0003bc-H5; Thu, 17 Jan 2019 16:34:26 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gk9gI-0007RM-Vr; Thu, 17 Jan 2019 17:34:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=2pfd/J0q5bBiZgzGduGHMVvfyaXYX2QLJlUuQ7QOwU8=; b=olA5XeO+yQOgtNRQgBOmudcO4s6L813tWM6HFUOp3+QedkyntSqueehUFk35LT2dkJrUvChAjkjkbBUdMfDFRVWX6CgGMhQSoqwzcCMCuhPwPhOheIFLf40pdb6FVtEyKmpt7TNXxs2c+zDNXnR3GqyEQjr/XTouaJI95MSQQ9sITZsBmPsC5IK1MfZZntb0uS+7rfUtyI3IbuUb+fKrQOyrC7tnL3U14pxMcJizPN9zz8HxvGfK/w7qtvvLDKmoRTvizajukDJgQ3vOKgd38Vrwk5ydi8ioL2TECO9u6gdbEWJ7UI2KFR+rn4SoEHK0SSwPrYGL+IEQBlFfx0QN6g==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2019 17:33:58 +0200 Message-Id: <6ec504767392cb91591542c416f0c2ae52f847f8.1547739122.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 07/13] block: Allow omitting the 'backing' option in certain cases 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-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Of all options of type BlockdevRef used to specify children in BlockdevOptions, 'backing' is the only one that is optional. For "x-blockdev-reopen" we want that if an option is omitted then it must be reset to its default value. The default value of 'backing' means that QEMU opens the backing file specified in the image metadata, but this is not something that we want to support for the reopen operation. Because of this the 'backing' option has to be specified during reopen, pointing to the existing backing file if we want to keep it, or pointing to a different one (or NULL) if we want to replace it (to be implemented in a subsequent patch). In order to simplify things a bit and not to require that the user passes the 'backing' option to every single block device even when it's clearly not necessary, this patch allows omitting this option if the block device being reopened doesn't have a backing file attached _and_ no default backing file is specified in the image metadata. Signed-off-by: Alberto Garcia --- block.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index fd51f1cd35..897c8b85cd 100644 --- a/block.c +++ b/block.c @@ -3336,7 +3336,13 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_stat= e, BlockReopenQueue *queue, =20 drv_prepared =3D true; =20 - if (reopen_state->backing_missing) { + /* + * We must provide the 'backing' option if the BDS has a backing + * file or if the image file has a backing file name as part of + * its metadata. Otherwise the 'backing' option can be omitted. + */ + if (reopen_state->backing_missing && + (backing_bs(reopen_state->bs) || reopen_state->bs->backing_file[0]= )) { error_setg(errp, "backing is missing for '%s'", reopen_state->bs->node_name); ret =3D -EINVAL; --=20 2.11.0