From nobody Tue Sep 9 03:16:12 2025 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=1748508576; cv=none; d=zohomail.com; s=zohoarc; b=HZjbl7LSzkET22d0bWL2hh63SIDOutvtI4oR43gsBwGCylv9bM5l5VrU45WsI1vicopU1jdn3mFTVczCm0y55CwvBnXfNfZM/e9Yd+CTg20RVPsb8eDiku6iUfjxuUe6cGCVcnQ4nJW2eCcmWMnYb2lAB9T5l84ox7/haipwgTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748508576; 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=ixzCGLCsaQxSRrZ96PjMo/C3bqjopf5bkbvki4Dq2QI=; b=QT3OV9CVD5Ov5gfSuGtK44oggtNI9XEE8/VRYGQGjP/PV7t9ipXhoc6L0TrFXwXjXiCH6Wx+lpth4Nt2drrLxTVfWBQueM5WmzDyWY1Z19c3Dq3iOv0EVBxmNd6A1tvEA2sCc0fqrnt0ZOJLhYpt+VU/93nx/imh4vrJrt/qq6w= 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 1748508576228598.3236705492144; Thu, 29 May 2025 01:49:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3D0D01878; Thu, 29 May 2025 04:49:35 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C5D2B1401; Thu, 29 May 2025 04:43:55 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E50B313C4; Thu, 29 May 2025 04:43:47 -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 762AB13D3 for ; Thu, 29 May 2025 04:43:25 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-531-VYyu4LauNyWPFENFCfMmpw-1; Thu, 29 May 2025 04:43:23 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6453D1800873 for ; Thu, 29 May 2025 08:43:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9C6FE19560AF for ; Thu, 29 May 2025 08:43:21 +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=1748508205; 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=YBTv+I3ffhsvr4kWUJt6GQ3gbcm0sMvW7QVGMC5As8Y=; b=gOLGlS9f9q3VNs9MPorbpRxoPx9s2xXS1qxVq7c0zcKhhgGc9YyP5QDLIit8w8agnoLjek ZB55trMWK8RAiXtVv/WC05w4UBvc466HZ8P6/UXzy7qTVFBPqWT9mSaYejRb6jgPeekiq5 pSEae+Ciu3v1TtBM+QDkONUAg2/goo0= X-MC-Unique: VYyu4LauNyWPFENFCfMmpw-1 X-Mimecast-MFC-AGG-ID: VYyu4LauNyWPFENFCfMmpw_1748508202 To: devel@lists.libvirt.org Subject: [PATCH 08/15] storage_file_probe: Refactor vmdk4GetBackingStore into vmdk4GetImageSpecific Date: Thu, 29 May 2025 10:43:02 +0200 Message-ID: <88dd5cdf323ef4e0d224ba599c3a2fcc30d27105.1748507931.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: tqb1HhzHGZMqVmbqKOtmvF2himcWBxLCYMzRoIsd37k_1748508202 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZDUNESHXJHW2FFMWP3ZKLKOM2EJZ7XEY X-Message-ID-Hash: ZDUNESHXJHW2FFMWP3ZKLKOM2EJZ7XEY 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: 1748508577052116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Change to the new function prototype and adjust the code to fill the fields in virStorageSource directly. Signed-off-by: Peter Krempa --- src/storage_file/storage_file_probe.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/stora= ge_file_probe.c index 1544dded5c..e741bccd44 100644 --- a/src/storage_file/storage_file_probe.c +++ b/src/storage_file/storage_file_probe.c @@ -114,8 +114,10 @@ static int qcowXGetBackingStore(char **, int *, static int qcow2GetDataFile(char **, virBitmap *, char *, size_t); static int qcow2GetFeatures(virBitmap **features, int format, char *buf, ssize_t len); -static int vmdk4GetBackingStore(char **, int *, - const char *, size_t); +static int +vmdk4GetImageSpecific(virStorageSource *meta, + const char *buf, + size_t buf_size); static int qedGetImageSpecific(virStorageSource *meta, const char *buf, @@ -336,7 +338,7 @@ static struct FileTypeInfo const fileTypeInfo[] =3D { [VIR_STORAGE_FILE_VMDK] =3D { 0, "KDMV", LV_LITTLE_ENDIAN, 4, 4, {1, 2, 3}, - 4+4+4, 8, 512, NULL, NULL, vmdk4GetBackingStore, NULL, NULL, NULL + 4+4+4, 8, 512, NULL, NULL, NULL, NULL, NULL, vmdk4GetImageSpecific }, }; G_STATIC_ASSERT(G_N_ELEMENTS(fileTypeInfo) =3D=3D VIR_STORAGE_FILE_LAST); @@ -607,10 +609,9 @@ qcow2GetDataFile(char **res, static int -vmdk4GetBackingStore(char **res, - int *format, - const char *buf, - size_t buf_size) +vmdk4GetImageSpecific(virStorageSource *meta, + const char *buf, + size_t buf_size) { static const char prefix[] =3D "parentFileNameHint=3D\""; char *start, *end; @@ -619,7 +620,7 @@ vmdk4GetBackingStore(char **res, desc =3D g_new0(char, VIR_STORAGE_MAX_HEADER); - *res =3D NULL; + g_clear_pointer(&meta->backingStoreRaw, g_free); /* * Technically this should have been VMDK, since * VMDK spec / VMware impl only support VMDK backed @@ -627,7 +628,7 @@ vmdk4GetBackingStore(char **res, * does probing on VMDK backing files, hence we set * AUTO */ - *format =3D VIR_STORAGE_FILE_AUTO; + meta->backingStoreRawFormat =3D VIR_STORAGE_FILE_AUTO; if (buf_size <=3D 0x200) return 0; @@ -639,7 +640,7 @@ vmdk4GetBackingStore(char **res, desc[len] =3D '\0'; start =3D strstr(desc, prefix); if (start =3D=3D NULL) { - *format =3D VIR_STORAGE_FILE_NONE; + meta->backingStoreRawFormat =3D VIR_STORAGE_FILE_NONE; return 0; } start +=3D strlen(prefix); @@ -648,11 +649,11 @@ vmdk4GetBackingStore(char **res, return 0; if (end =3D=3D start) { - *format =3D VIR_STORAGE_FILE_NONE; + meta->backingStoreRawFormat =3D VIR_STORAGE_FILE_NONE; return 0; } *end =3D '\0'; - *res =3D g_strdup(start); + meta->backingStoreRaw =3D g_strdup(start); return 0; } --=20 2.49.0