From nobody Sun Feb 8 15:30:08 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=1725719540; cv=none; d=zohomail.com; s=zohoarc; b=CoqO0B+6ukPYstkmgYYI0+cTTxVCSB5Qd2+wV4mzp12dTO0Xs+TTSpPLutlYLDB3y+xDknnBrE2do5ZhJQBHKdv1llYkPIsxmk4C5x4ORXtHi3qbyBQb60O4w55GOcOBzX9UMMZUqF8VNPtMEUj/tAp9q4CvZHkDz8RaEW73yQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725719540; h=Content-Transfer-Encoding:Cc:Cc: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; bh=JP3HL7dehFuZBLFIz9lM7Z5n5PdOxtjnbcQ7Olb50Bw=; b=gqW75muikOG0jTpIyBynvJMCI0mr0H5kCsC7AFEtCbWpruKZHJFDv3kDSRKwAI9XB5sEl6DctNjDdsdCQTJ/u7ow/QkZvJaWTRwWE0hZrawCoeB4MYB19albw76U996G5vJyHZAA8LIGH1dUEjvy1LSmVlgbUu2Tb7Q9RnkE/k4= 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 1725719540646640.0448850466589; Sat, 7 Sep 2024 07:32:20 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8A8F41915; Sat, 7 Sep 2024 10:32:19 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 34BE118A2; Sat, 7 Sep 2024 10:31:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B1D361825; Sat, 7 Sep 2024 10:31:39 -0400 (EDT) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) (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 9D85E1902 for ; Sat, 7 Sep 2024 10:31:10 -0400 (EDT) Received: from [130.117.225.1] (helo=vz9-barybin-2.ch-qa.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1smwQT-001ZxE-2L; Sat, 07 Sep 2024 16:31:04 +0200 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=S8DuN+kTOv4Ht3NrQvuw0YeiIiO63cFzNhZ8A/HsopA=; b=LGeogMYrMOBt Q2tUMtO8B6KuJv+jDEVfY7efnc7uO9v60KuHU+6N5REHvdBQQ0E0G0HdcbkZ/25G3Q/+c9hL5qTtj 3KjU7UCtfQpqMp5oPH8wqVbpwlkjFw5AZ+BW+ZTswXa16tz7OG1y9eWWUzTLds4i3ne5iapU679CM VuFADhcQooQe+2GfDOiCoHchN3I64ydTItmxDBd5PMarPNgT01weZ0CsfwlJQbmuG2Lv66vjqQQY/ /dVq4Pmyj84xpPBreN5PDBUb1U9BrCC9ay0M5IYE/rwfy1VMUAdnBGDMxN8X5NaSKumjO/PKLISkw XoFRpwoYAIDrAObOvPWFAA==; To: devel@lists.libvirt.org Subject: [PATCH v2 04/13] storage file: fill in src->dataFileStore during file probe Date: Sat, 7 Sep 2024 17:15:23 +0300 Message-ID: <20240907143006.50677-9-nikolai.barybin@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240907143006.50677-1-nikolai.barybin@virtuozzo.com> References: <20240907143006.50677-1-nikolai.barybin@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VSAXWZNIJ3CDELDBRKINGF7OUJJ4CCXU X-Message-ID-Hash: VSAXWZNIJ3CDELDBRKINGF7OUJJ4CCXU X-MailFrom: nikolai.barybin@virtuozzo.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 CC: den@openvz.org, Nikolai Barybin 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: Nikolai Barybin via Devel Reply-To: Nikolai Barybin X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725719541093116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Nikolai Barybin --- src/storage_file/storage_source.c | 28 ++++++++++++++++++++++++++++ src/storage_file/storage_source.h | 3 +++ 2 files changed, 31 insertions(+) diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_s= ource.c index 2cfe3bc325..20d5b30c6c 100644 --- a/src/storage_file/storage_source.c +++ b/src/storage_file/storage_source.c @@ -543,6 +543,22 @@ virStorageSourceNewFromBacking(virStorageSource *paren= t, } =20 =20 +int virStorageSourceNewFromDataFile(virStorageSource *parent, + virStorageSource **dataFileSrc) +{ + int rc; + + if ((rc =3D virStorageSourceNewFromChild(parent, + parent->dataFileRaw, + dataFileSrc)) < 0) + return rc; + + (*dataFileSrc)->format =3D VIR_STORAGE_FILE_RAW; + (*dataFileSrc)->readonly =3D parent->readonly; + return rc; +} + + /** * @src: disk source definition structure * @fd: file descriptor @@ -1391,6 +1407,18 @@ virStorageSourceGetMetadataRecurse(virStorageSource = *src, } } =20 + if (src->dataFileRaw) { + g_autoptr(virStorageSource) dataFileStore =3D NULL; + if ((rv =3D virStorageSourceNewFromDataFile(src, &dataFileStore)) = < 0) + return -1; + + /* the data file would not be usable for VM usage */ + if (rv =3D=3D 1) + return 0; + + src->dataFileStore =3D g_steal_pointer(&dataFileStore); + } + if (src->backingStoreRaw) { if ((rv =3D virStorageSourceNewFromBacking(src, &backingStore)) < = 0) return -1; diff --git a/src/storage_file/storage_source.h b/src/storage_file/storage_s= ource.h index 63fefb6919..0514ff2364 100644 --- a/src/storage_file/storage_source.h +++ b/src/storage_file/storage_source.h @@ -72,6 +72,9 @@ int virStorageSourceNewFromBacking(virStorageSource *parent, virStorageSource **backing); =20 +int virStorageSourceNewFromDataFile(virStorageSource *parent, + virStorageSource **dataFileSrc); + int virStorageSourceGetRelativeBackingPath(virStorageSource *top, virStorageSource *base, --=20 2.43.5