From nobody Mon Feb 9 10:48:42 2026 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=1655742672; cv=none; d=zohomail.com; s=zohoarc; b=C1YZNna9jdvxOp873GuuGgTKu/44YK33GUYZXhWDdmrcZy2rvE192NkyA52iEEcH5wi4ihY3YQk13LtRn5JUd7EzAIpPha+LscMgThEzaIjy+tqAnb6EQr3YbDBLVc6s65SyJns/AiXdzRT3xq9f0dhnffVvVqRTdAQBZh5+MXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655742672; 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=9I6OjyTmx9o3Yi4Vwfplt31NAiJmb8LFOaJgJMJWUhg=; b=PLnZtiCsWfWaA9+wGKlnjl14Gd9Q3uIe1HZrxdmcHL62yuzo3qo7/S12hWLcL08LQxbGTquprzKznLmU1dg4xlhScoqwvKxICPdc4cjUQAK7hcBRNsLHyI2PauxPzD/cyMMGc70oOW8L+QTJ/a3SdwJgGCIfwZB3FTgo4llOw6E= 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 165574267228029.486558763975154; Mon, 20 Jun 2022 09:31:12 -0700 (PDT) Received: from localhost ([::1]:42974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3KIx-0002jx-6v for importer@patchew.org; Mon, 20 Jun 2022 12:31:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3KF9-0005ek-5r for qemu-devel@nongnu.org; Mon, 20 Jun 2022 12:27:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:48308) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3KF5-0005Hw-TB for qemu-devel@nongnu.org; Mon, 20 Jun 2022 12:27:14 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-17--rTSKz8FPeS4rEcyAIwy4g-1; Mon, 20 Jun 2022 12:27:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E672F801756; Mon, 20 Jun 2022 16:27:08 +0000 (UTC) Received: from localhost (unknown [10.39.193.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A37412166B26; Mon, 20 Jun 2022 16:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655742430; 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=9I6OjyTmx9o3Yi4Vwfplt31NAiJmb8LFOaJgJMJWUhg=; b=NC8GeVyweHVSxwz0okEuYGZW0MMw/XjmM0qL/dY0MBPeDewB8rcTI/cNH7ZQuIf4/8hTZc MRL4BloHuPQgiNSANq2DQo1+MeLd6Wkd3cRqwf2jVKqdi/D7LXIe+hoYvpr9WlZUFkkiA7 Lzq/UhUxyIYV7/Ssg5wjI14kM8Udysw= X-MC-Unique: -rTSKz8FPeS4rEcyAIwy4g-1 From: Hanna Reitz To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Hanna Reitz , Kevin Wolf , Eric Blake , Markus Armbruster Subject: [PATCH v2 02/12] block/file: Add file-specific image info Date: Mon, 20 Jun 2022 18:26:54 +0200 Message-Id: <20220620162704.80987-3-hreitz@redhat.com> In-Reply-To: <20220620162704.80987-1-hreitz@redhat.com> References: <20220620162704.80987-1-hreitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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.129.124; envelope-from=hreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655742673041100001 Content-Type: text/plain; charset="utf-8" Add some (optional) information that the file driver can provide for image files, namely the extent size hint. Signed-off-by: Hanna Reitz Reviewed-by: Eric Blake --- qapi/block-core.json | 26 ++++++++++++++++++++++++-- block/file-posix.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 457df16638..40fb307e2d 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -139,16 +139,29 @@ '*encryption-format': 'RbdImageEncryptionFormat' } } =20 +## +# @ImageInfoSpecificFile: +# +# @extent-size-hint: Extent size hint (if available) +# +# Since: 7.1 +## +{ 'struct': 'ImageInfoSpecificFile', + 'data': { + '*extent-size-hint': 'size' + } } + ## # @ImageInfoSpecificKind: # # @luks: Since 2.7 # @rbd: Since 6.1 +# @file: Since 7.1 # # Since: 1.7 ## { 'enum': 'ImageInfoSpecificKind', - 'data': [ 'qcow2', 'vmdk', 'luks', 'rbd' ] } + 'data': [ 'qcow2', 'vmdk', 'luks', 'rbd', 'file' ] } =20 ## # @ImageInfoSpecificQCow2Wrapper: @@ -185,6 +198,14 @@ { 'struct': 'ImageInfoSpecificRbdWrapper', 'data': { 'data': 'ImageInfoSpecificRbd' } } =20 +## +# @ImageInfoSpecificFileWrapper: +# +# Since: 7.1 +## +{ 'struct': 'ImageInfoSpecificFileWrapper', + 'data': { 'data': 'ImageInfoSpecificFile' } } + ## # @ImageInfoSpecific: # @@ -199,7 +220,8 @@ 'qcow2': 'ImageInfoSpecificQCow2Wrapper', 'vmdk': 'ImageInfoSpecificVmdkWrapper', 'luks': 'ImageInfoSpecificLUKSWrapper', - 'rbd': 'ImageInfoSpecificRbdWrapper' + 'rbd': 'ImageInfoSpecificRbdWrapper', + 'file': 'ImageInfoSpecificFileWrapper' } } =20 ## diff --git a/block/file-posix.c b/block/file-posix.c index 48cd096624..74a649b409 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3083,6 +3083,34 @@ static int raw_get_info(BlockDriverState *bs, BlockD= riverInfo *bdi) return 0; } =20 +static ImageInfoSpecific *raw_get_specific_info(BlockDriverState *bs, + Error **errp) +{ + BDRVRawState *s =3D bs->opaque; + ImageInfoSpecificFile *file_info =3D g_new0(ImageInfoSpecificFile, 1); + ImageInfoSpecific *spec_info =3D g_new(ImageInfoSpecific, 1); + + *spec_info =3D (ImageInfoSpecific){ + .type =3D IMAGE_INFO_SPECIFIC_KIND_FILE, + .u.file.data =3D file_info, + }; + +#ifdef FS_IOC_FSGETXATTR + { + struct fsxattr attr; + int ret; + + ret =3D ioctl(s->fd, FS_IOC_FSGETXATTR, &attr); + if (!ret && attr.fsx_extsize !=3D 0) { + file_info->has_extent_size_hint =3D true; + file_info->extent_size_hint =3D attr.fsx_extsize; + } + } +#endif + + return spec_info; +} + static BlockStatsSpecificFile get_blockstats_specific_file(BlockDriverStat= e *bs) { BDRVRawState *s =3D bs->opaque; @@ -3316,6 +3344,7 @@ BlockDriver bdrv_file =3D { .bdrv_co_truncate =3D raw_co_truncate, .bdrv_getlength =3D raw_getlength, .bdrv_get_info =3D raw_get_info, + .bdrv_get_specific_info =3D raw_get_specific_info, .bdrv_get_allocated_file_size =3D raw_get_allocated_file_size, .bdrv_get_specific_stats =3D raw_get_specific_stats, @@ -3688,6 +3717,7 @@ static BlockDriver bdrv_host_device =3D { .bdrv_co_truncate =3D raw_co_truncate, .bdrv_getlength =3D raw_getlength, .bdrv_get_info =3D raw_get_info, + .bdrv_get_specific_info =3D raw_get_specific_info, .bdrv_get_allocated_file_size =3D raw_get_allocated_file_size, .bdrv_get_specific_stats =3D hdev_get_specific_stats, --=20 2.35.3