From nobody Mon Feb 9 10:54:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1750167902; cv=none; d=zohomail.com; s=zohoarc; b=JQ6gdfmH3IWhMv4iE97MYgKqmdh2vZBZWFZgNsPEij9mZ3NCy2jmvlxqWx8QlVPt4bJUtQ+LysDLHHwdkBflFROphkFCk+zrmojt0pspSvkDJBgViq8A7A3l68FCuRTTjmRfMqQoMIyuMqKqtF/dv+6pGBASkUsC4M6TJeFdqSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750167902; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Rvd6LsYConXbox3LBlZwjjzp16wdHv+ch48ns+os68k=; b=ZncRdz4dFZgK5s5U0L21l8Vprst8zeScJi820CixbO+fR1S9jLeUR2dMOWxBZ7CRAKOZgGJ0k6EtVdP9ujka9IlQevohwe9gxxXdyAqbZNgb5N46BYqBegJd9LNtOfJNbHWUdjzW4PEcuQHCUfSJIx+nm9Po1j260V4w17v8iKk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1750167902909663.8339583454103; Tue, 17 Jun 2025 06:45:02 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C265ED46; Tue, 17 Jun 2025 09:45:01 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B69D3E7B; Tue, 17 Jun 2025 09:44:11 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 51F66B99; Tue, 17 Jun 2025 09:44:07 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 97753B64 for ; Tue, 17 Jun 2025 09:44:06 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-225-ar3ent0mPAmRESKzpaXqPw-1; Tue, 17 Jun 2025 09:44:04 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 77C7F19560AA for ; Tue, 17 Jun 2025 13:44:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.10]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B0F7E180045B for ; Tue, 17 Jun 2025 13:44:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750167846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EEAqbZ1IVoH3dClP7JZCEWRe/s3zZPT2Yl2/z6AbmOs=; b=DpdCJSPNex3/j5mtqCDMKpQh12SISiu4ujFjxekt8X4i3HA7hdYwLYy6bijjOR1c1fxD9i usSuFpAIxV3TIEVXhYXiZeo42jYTF6HXZMX8m3jzRd1M/53JPhuaXdzvmdNC+gAMEHogw4 jaJI2cRjamoea2I3MtuONfMP9fQ80o8= X-MC-Unique: ar3ent0mPAmRESKzpaXqPw-1 X-Mimecast-MFC-AGG-ID: ar3ent0mPAmRESKzpaXqPw_1750167843 To: devel@lists.libvirt.org Subject: [PATCH 1/6] storage_file_probe: Use named initializer for 'struct FileTypeInfo' Date: Tue, 17 Jun 2025 15:43:54 +0200 Message-ID: <800d808d6740810974d9f8d8b5fa5dac71d9f88c.1750167757.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KzJXyBwZT12ZLccQzuILHEBBKy4RogaNqTgdUYz4_kM_1750167843 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DAV63OX4NI2OJXDQYLONX2NYYFKLUE4D X-Message-ID-Hash: DAV63OX4NI2OJXDQYLONX2NYYFKLUE4D X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1750167905014116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa --- src/storage_file/storage_file_probe.c | 174 ++++++++++++++++++-------- 1 file changed, 119 insertions(+), 55 deletions(-) diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/stora= ge_file_probe.c index 26f8d63e9a..82cea28b20 100644 --- a/src/storage_file/storage_file_probe.c +++ b/src/storage_file/storage_file_probe.c @@ -242,92 +242,156 @@ static struct FileEncryptionInfo const qcow2Encrypti= onInfo[] =3D { }; static struct FileTypeInfo const fileTypeInfo[] =3D { - [VIR_STORAGE_FILE_NONE] =3D { 0, NULL, LV_LITTLE_ENDIAN, - -1, 0, {0}, 0, 0, 0, NULL, NULL }, - [VIR_STORAGE_FILE_RAW] =3D { 0, NULL, LV_LITTLE_ENDIAN, - -1, 0, {0}, 0, 0, 0, - luksEncryptionInfo, - NULL }, - [VIR_STORAGE_FILE_DIR] =3D { 0, NULL, LV_LITTLE_ENDIAN, - -1, 0, {0}, 0, 0, 0, NULL, NULL }, + [VIR_STORAGE_FILE_NONE] =3D { + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -1, + }, + [VIR_STORAGE_FILE_RAW] =3D { + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -1, + .cryptInfo =3D luksEncryptionInfo, + }, + [VIR_STORAGE_FILE_DIR] =3D { + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -1, + .cryptInfo =3D luksEncryptionInfo, + }, [VIR_STORAGE_FILE_BOCHS] =3D { /*"Bochs Virtual HD Image", */ /* Untested */ - 0, NULL, - LV_LITTLE_ENDIAN, 64, 4, {0x20000}, - 32+16+16+4+4+4+4+4, 8, 1, NULL, NULL + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D 64, + .versionSize =3D 4, + .versionNumbers =3D {0x20000}, + .sizeOffset =3D 32 + 16 + 16 + 4 + 4 + 4 + 4 + 4, + .sizeBytes =3D 8, + .sizeMultiplier =3D 1, }, + [VIR_STORAGE_FILE_CLOOP] =3D { /* #!/bin/sh #V2.0 Format modprobe cloop file=3D$0 && mount -r -t iso9660 /dev/cloop $1 */ /* Untested */ - 0, NULL, - LV_LITTLE_ENDIAN, -1, 0, {0}, - -1, 0, 0, NULL, NULL + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -1, + .sizeOffset =3D -1, }, [VIR_STORAGE_FILE_DMG] =3D { /* XXX QEMU says there's no magic for dmg, * /usr/share/misc/magic lists double magic (both offsets * would have to match) but then disables that check. */ - 0, NULL, - 0, -1, 0, {0}, - -1, 0, 0, NULL, NULL + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -1, + .sizeOffset =3D -1, }, [VIR_STORAGE_FILE_ISO] =3D { - 32769, "CD001", - LV_LITTLE_ENDIAN, -2, 0, {0}, - -1, 0, 0, NULL, NULL + .magicOffset =3D 32769, + .magic =3D "CD001", + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -2, + .sizeOffset =3D -1, }, [VIR_STORAGE_FILE_VPC] =3D { - 0, "conectix", - LV_BIG_ENDIAN, 12, 4, {0x10000}, - 8 + 4 + 4 + 8 + 4 + 4 + 2 + 2 + 4, 8, 1, NULL, NULL + .magicOffset =3D 0, + .magic =3D "conectix", + .endian =3D LV_BIG_ENDIAN, + .versionOffset =3D 12, + .versionSize =3D 4, + .versionNumbers =3D {0x10000}, + .sizeOffset =3D 8 + 4 + 4 + 8 + 4 + 4 + 2 + 2 + 4, + .sizeBytes =3D 8, + .sizeMultiplier =3D 1, }, - /* TODO: add getBackingStore function */ [VIR_STORAGE_FILE_VDI] =3D { - 64, "\x7f\x10\xda\xbe", - LV_LITTLE_ENDIAN, 68, 4, {0x00010001}, - 64 + 5 * 4 + 256 + 7 * 4, 8, 1, NULL, NULL }, - + .magicOffset =3D 64, + .magic =3D "\x7f\x10\xda\xbe", + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D 68, + .versionSize =3D 4, + .versionNumbers =3D {0x00010001}, + .sizeOffset =3D 64 + 5 * 4 + 256 + 7 * 4, + .sizeBytes =3D 8, + .sizeMultiplier =3D 1, + }, /* Not direct file formats, but used for various drivers */ - [VIR_STORAGE_FILE_FAT] =3D { 0, NULL, LV_LITTLE_ENDIAN, - -1, 0, {0}, 0, 0, 0, NULL, NULL }, - [VIR_STORAGE_FILE_VHD] =3D { 0, NULL, LV_LITTLE_ENDIAN, - -1, 0, {0}, 0, 0, 0, NULL, NULL }, - [VIR_STORAGE_FILE_PLOOP] =3D { 0, "WithouFreSpacExt", LV_LITTLE_ENDIAN, - -2, 0, {0}, PLOOP_IMAGE_SIZE_OFFSET, 8, - PLOOP_SIZE_MULTIPLIER, NULL, NULL }, - + [VIR_STORAGE_FILE_FAT] =3D { + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -1, + }, + [VIR_STORAGE_FILE_VHD] =3D { + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -1, + }, + [VIR_STORAGE_FILE_PLOOP] =3D { + .magicOffset =3D 0, + .magic =3D "WithouFreSpacExt", + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -2, + .sizeOffset =3D PLOOP_IMAGE_SIZE_OFFSET, + .sizeBytes =3D 8, + .sizeMultiplier =3D PLOOP_SIZE_MULTIPLIER, + }, /* All formats with a backing store probe below here */ [VIR_STORAGE_FILE_COW] =3D { - 0, "OOOM", - LV_BIG_ENDIAN, 4, 4, {2}, - 4+4+1024+4, 8, 1, NULL, cowGetImageSpecific + .magicOffset =3D 0, + .magic =3D "OOOM", + .endian =3D LV_BIG_ENDIAN, + .versionOffset =3D 4, + .versionSize =3D 4, + .versionNumbers =3D {2}, + .sizeOffset =3D 4 + 4 + 1024 + 4, + .sizeBytes =3D 8, + .sizeMultiplier =3D 1, + .getImageSpecific =3D cowGetImageSpecific, }, [VIR_STORAGE_FILE_QCOW] =3D { - 0, "QFI", - LV_BIG_ENDIAN, 4, 4, {1}, - QCOWX_HDR_IMAGE_SIZE, 8, 1, - qcow1EncryptionInfo, - qcowGetImageSpecific + .magicOffset =3D 0, + .magic =3D "QFI", + .endian =3D LV_BIG_ENDIAN, + .versionOffset =3D 4, + .versionSize =3D 4, + .versionNumbers =3D {1}, + .sizeOffset =3D QCOWX_HDR_IMAGE_SIZE, + .sizeBytes =3D 8, + .sizeMultiplier =3D 1, + .cryptInfo =3D qcow1EncryptionInfo, + .getImageSpecific =3D qcowGetImageSpecific, }, [VIR_STORAGE_FILE_QCOW2] =3D { - 0, "QFI", - LV_BIG_ENDIAN, 4, 4, {2, 3}, - QCOWX_HDR_IMAGE_SIZE, 8, 1, - qcow2EncryptionInfo, - qcow2GetImageSpecific + .magicOffset =3D 0, + .magic =3D "QFI", + .endian =3D LV_BIG_ENDIAN, + .versionOffset =3D 4, + .versionSize =3D 4, + .versionNumbers =3D {2, 3}, + .sizeOffset =3D QCOWX_HDR_IMAGE_SIZE, + .sizeBytes =3D 8, + .sizeMultiplier =3D 1, + .cryptInfo =3D qcow2EncryptionInfo, + .getImageSpecific =3D qcow2GetImageSpecific, }, [VIR_STORAGE_FILE_QED] =3D { /* https://wiki.qemu.org/Features/QED */ - 0, "QED", - LV_LITTLE_ENDIAN, -2, 0, {0}, - QED_HDR_IMAGE_SIZE, 8, 1, NULL, qedGetImageSpecific + .magicOffset =3D 0, + .magic =3D "QED", + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D -2, + .sizeOffset =3D QED_HDR_IMAGE_SIZE, + .sizeBytes =3D 8, + .sizeMultiplier =3D 1, + .getImageSpecific =3D qedGetImageSpecific, }, [VIR_STORAGE_FILE_VMDK] =3D { - 0, "KDMV", - LV_LITTLE_ENDIAN, 4, 4, {1, 2, 3}, - 4+4+4, 8, 512, NULL, vmdk4GetImageSpecific + .magicOffset =3D 0, + .magic =3D "KDMV", + .endian =3D LV_LITTLE_ENDIAN, + .versionOffset =3D 4, + .versionSize =3D 4, + .versionNumbers =3D {1, 2, 3}, + .sizeOffset =3D 4 + 4 + 4, + .sizeBytes =3D 8, + .sizeMultiplier =3D 512, + .getImageSpecific =3D vmdk4GetImageSpecific, }, }; G_STATIC_ASSERT(G_N_ELEMENTS(fileTypeInfo) =3D=3D VIR_STORAGE_FILE_LAST); --=20 2.49.0