From nobody Tue Nov 11 20:53:32 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565367702; cv=none; d=zoho.com; s=zohoarc; b=cSQ2FIn69RQVs/qUH7X+IOzARaaJ9b4sMWCsfPC10RltYoEKwtMf9sZSrm6UHflyPxzCcEMd9IV7tdIfUYqxA8G6WcK1PLdKPm+f72hf+LM+La/SjKg5X4mjfEM0nDD9WfhiF4SgErD1pl1sJ0alNcL8OmjlYPLYVZ/NfojuOtw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565367702; h=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:ARC-Authentication-Results; bh=xvXmSvuaqCjTZuOlw/NJCWTcpFlm4/EZnyUKn0yfrz8=; b=HPZPTO6I4yoqf9MmGelgRVm9K/FgDdLWB9KBAZE7ZnwMznF/8N8nDWJTNPE/vsRPlFiIAwgv4rQuplWx2HC0tMb3Yl9bRsW5uNXtEkQpDFZx4G0Jp0Bf/SsCpyuKODlKIK/7sHOUFIQG6XvbEQhgXnB0RvHPG1tR0a63PUI2HfI= ARC-Authentication-Results: i=1; mx.zoho.com; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565367702699268.70117954023704; Fri, 9 Aug 2019 09:21:42 -0700 (PDT) Received: from localhost ([::1]:60930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw7e9-0008Uv-Lm for importer@patchew.org; Fri, 09 Aug 2019 12:21:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57327) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw7Xj-0002P6-Q5 for qemu-devel@nongnu.org; Fri, 09 Aug 2019 12:15:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hw7Xi-0004JR-Oj for qemu-devel@nongnu.org; Fri, 09 Aug 2019 12:15:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44832) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hw7Xg-0004I5-Hk; Fri, 09 Aug 2019 12:15:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D62ED30BE7DB; Fri, 9 Aug 2019 16:14:59 +0000 (UTC) Received: from localhost (unknown [10.40.205.179]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D58C600CD; Fri, 9 Aug 2019 16:14:59 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 9 Aug 2019 18:13:47 +0200 Message-Id: <20190809161407.11920-23-mreitz@redhat.com> In-Reply-To: <20190809161407.11920-1-mreitz@redhat.com> References: <20190809161407.11920-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 09 Aug 2019 16:14:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 22/42] block: Fix bdrv_get_allocated_file_size's fallback 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If the driver does not implement bdrv_get_allocated_file_size(), we should fall back to cumulating the allocated size of all non-COW children instead of just bs->file. Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 1070aa1ba9..6e1ddab056 100644 --- a/block.c +++ b/block.c @@ -4650,9 +4650,27 @@ int64_t bdrv_get_allocated_file_size(BlockDriverStat= e *bs) if (drv->bdrv_get_allocated_file_size) { return drv->bdrv_get_allocated_file_size(bs); } - if (bs->file) { - return bdrv_get_allocated_file_size(bs->file->bs); + + if (!QLIST_EMPTY(&bs->children)) { + BdrvChild *child; + int64_t child_size, total_size =3D 0; + + QLIST_FOREACH(child, &bs->children, next) { + if (child =3D=3D bdrv_filtered_cow_child(bs)) { + /* Ignore COW backing files */ + continue; + } + + child_size =3D bdrv_get_allocated_file_size(child->bs); + if (child_size < 0) { + return child_size; + } + total_size +=3D child_size; + } + + return total_size; } + return -ENOTSUP; } =20 --=20 2.21.0