From nobody Sat Nov 15 04:18:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593099363; cv=none; d=zohomail.com; s=zohoarc; b=F6EVIQH+YQ4KodGM611WjEWhS8I8gd9Ci1nY0mLL72P1cFGPE+1bhVorO3SAw1MjBziy1sInHSyTRSXKEiWwnI8LxE6nD/gAdOaGmOcJcAuEdxEEeDcGnyItG3MTvi2hAppLOtAONBclY0JLlsfRkBTnptwKfZxLxMgAXMI55Yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593099363; 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=b5StjsjJhsZsnZZzQfDp+9DI9Lw+3xyP1G23UeZlOeE=; b=Us0voZA9hlpMGjzBAf78EssR5Bia9pAtUWdGMPh5pLve/286oZTgHVWWYKNU2WNC7F6X6S8JhuwzylcKeGUwtyY3NK00rP6rT/djsrRg0mJ04kcOKdmYOcL5vpg9z+uFrw0E2cdcRQK88YOPyg7IR4D88Y0vBtFzTXZ2hoMdhto= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1593099363316489.6885462042259; Thu, 25 Jun 2020 08:36:03 -0700 (PDT) Received: from localhost ([::1]:39924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joTv0-0006Ze-25 for importer@patchew.org; Thu, 25 Jun 2020 11:36:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joTiq-0006Hg-92 for qemu-devel@nongnu.org; Thu, 25 Jun 2020 11:23:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27173 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joTio-0001EL-2r for qemu-devel@nongnu.org; Thu, 25 Jun 2020 11:23:27 -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-379-iJ_gJPFAPeWReI4mfxLjig-1; Thu, 25 Jun 2020 11:23:17 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B19A80400F; Thu, 25 Jun 2020 15:23:16 +0000 (UTC) Received: from localhost (ovpn-113-182.ams2.redhat.com [10.36.113.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1002779310; Thu, 25 Jun 2020 15:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593098601; 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=b5StjsjJhsZsnZZzQfDp+9DI9Lw+3xyP1G23UeZlOeE=; b=I1yBLMjXiAyVIf1Ur8rigNots4Pn1y9w6HRwWZ9Yb5H61QH7VddAeu2NNofRkZwPMy8nps /l28p0MLmybpX7R5z66bi7rkC3N9vG1LNW7DKrnd3ooKbiBar3q4PhBX8fcxDiq9gr4vZy jE8XuLXDHMuJJc29A30L1Qq4qvH1af4= X-MC-Unique: iJ_gJPFAPeWReI4mfxLjig-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v7 26/47] block: Improve get_allocated_file_size's default Date: Thu, 25 Jun 2020 17:21:54 +0200 Message-Id: <20200625152215.941773-27-mreitz@redhat.com> In-Reply-To: <20200625152215.941773-1-mreitz@redhat.com> References: <20200625152215.941773-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=207.211.31.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 01:47:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@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-Type: text/plain; charset="utf-8" There are two practical problems with bdrv_get_allocated_file_size()'s default right now: (1) For drivers with children, we should generally sum all their sizes instead of just passing the request through to bs->file. The latter is good for filters, but not so much for format drivers. (2) Filters need not have bs->file, so we should actually go to the filtered child instead of hard-coding bs->file. And we can make the whole default implementation more idiomatic by using the three generic functions added by the previous patch. Signed-off-by: Max Reitz Reviewed-by: Andrey Shinkevich --- block.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index fc01ce90b3..a19f243997 100644 --- a/block.c +++ b/block.c @@ -4997,10 +4997,21 @@ int64_t bdrv_get_allocated_file_size(BlockDriverSta= te *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 (drv->bdrv_file_open) { + /* + * Protocol drivers default to -ENOTSUP (most of their data is + * not stored in any of their children (if they even have any), + * so there is no generic way to figure it out). + */ + return bdrv_notsup_allocated_file_size(bs); + } else if (drv->is_filter) { + /* Filter drivers default to the size of their primary child */ + return bdrv_primary_allocated_file_size(bs); + } else { + /* Other drivers default to summing their children's sizes */ + return bdrv_sum_allocated_file_size(bs); } - return -ENOTSUP; } =20 /** --=20 2.26.2