From nobody Tue Sep 9 03:20:40 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=1748508398; cv=none; d=zohomail.com; s=zohoarc; b=QrBjjlqojBLtRJrQTNjOJ3YgvPHMCfxpTpLtw+5YOAvspXnN7sMnenKCm65/2hGq+8PnrwjDR2VXD3q+qRJxyVCJM9EmtU51iN+qcieO+Z0WeQjscr0xk6+YRFqEYNsAE6UD21O6strLxaQdkzRXGOOw1DBKYujsSzD9ouP5q2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748508398; 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=f3vsNNbC3wcfiHGyMfn4v03tZjaIr3gi0cbk5W6xnHc=; b=AJ6mhvdKWoVJIC2mXudOuiqBbbsTmo+2jk9e9IJATj1RMMCT17Z3qeFS1zZoa96itDw3nOHl1Wal2Z/26tlvYO3/C5oBNqPDeUwCxrW3IF3ohTjWpLISYCS5qnXYBvW9HtrF/JSC3RFRANmVZS7KR5ThMzr/mfD89wQ7q8Gk0AQ= 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 1748508398565328.82926767545416; Thu, 29 May 2025 01:46:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 97EDC1347; Thu, 29 May 2025 04:46:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A27FD13D1; Thu, 29 May 2025 04:43:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id ACEC713D1; Thu, 29 May 2025 04:43:35 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 5ADB51374 for ; Thu, 29 May 2025 04:43:17 -0400 (EDT) Received: from mx-prod-mc-06.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-266-ph4ATGM4Po25234uZGOjdw-1; Thu, 29 May 2025 04:43:15 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AA3EC180035C for ; Thu, 29 May 2025 08:43:14 +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 B03FB19560B3 for ; Thu, 29 May 2025 08:43:13 +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,WEIRD_PORT 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=1748508197; 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=jMc8IQwr701p40A1b/o0s3U52o3xfhnCnM9XRznCGkQ=; b=OI7cXSpvRpczgaZxH8GcyXHR19+hEvtsEvgXiT0tXqbLif5ZyPOere446lIP6vo7kQKOnH NfkjPOEj4aM4sc0HLfDWLro5TIEU21et5EQlDbGdkSMZsB4Ka+QyfCLmVJCJpIc/EiitGe VFTORZXPuKmMfy0XULaTyvVpsZVf1Ug= X-MC-Unique: ph4ATGM4Po25234uZGOjdw-1 X-Mimecast-MFC-AGG-ID: ph4ATGM4Po25234uZGOjdw_1748508194 To: devel@lists.libvirt.org Subject: [PATCH 02/15] virstoragetest: Reformat output to hilight dataFile relationship Date: Thu, 29 May 2025 10:42:56 +0200 Message-ID: <6fccf98186dffbab6454857d18132d6792e8a58c.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: nfW7ZQmLRvamO-IjKcnnQQP3V2-OFj0ZjCmeZdzqWgQ_1748508194 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: U6WOUYJBCRFCIZPA754OL7I7ARXDDOMS X-Message-ID-Hash: U6WOUYJBCRFCIZPA754OL7I7ARXDDOMS 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: 1748508399296116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Move the 'dataFileRaw' field to the main block as it's based on the data in the qcow2 header same as 'backingStoreRaw'. Indent and annotate the corresponding dataFile block to show where it belongs. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/virstoragetest.c | 20 ++++++++++--------- tests/virstoragetestdata/out/directory-dir | 1 + tests/virstoragetestdata/out/directory-none | 1 + tests/virstoragetestdata/out/directory-raw | 1 + .../out/qcow2-auto_qcow2-qcow2_raw-raw | 1 + .../out/qcow2-auto_raw-raw-relative | 1 + tests/virstoragetestdata/out/qcow2-datafile | 15 +++++++------- .../out/qcow2-protocol-backing-file | 2 ++ .../out/qcow2-protocol-backing-nbd | 2 ++ .../out/qcow2-qcow2_nbd-raw | 2 ++ .../out/qcow2-qcow2_qcow2-auto | 2 ++ .../out/qcow2-qcow2_qcow2-qcow2_qcow2-auto | 3 +++ .../out/qcow2-qcow2_qcow2-qcow2_raw-auto | 3 +++ .../out/qcow2-qcow2_qcow2-qcow2_raw-raw | 3 +++ .../out/qcow2-qcow2_raw-raw-relative | 2 ++ tests/virstoragetestdata/out/qcow2-symlinks | 3 +++ .../out/qcow2datafile-qcow2_qcow2-datafile | 16 +++++++-------- tests/virstoragetestdata/out/qed-auto_raw | 1 + tests/virstoragetestdata/out/qed-qed_raw | 2 ++ tests/virstoragetestdata/out/raw-auto | 1 + tests/virstoragetestdata/out/raw-raw | 1 + 21 files changed, 58 insertions(+), 25 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 78dc644637..e568bd3141 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -179,12 +179,14 @@ testStorageChain(const void *args) for (elt =3D meta; virStorageSourceIsBacking(elt); elt =3D elt->backin= gStore) { g_autofree char *strippedPath =3D virTestStablePath(elt->path); g_autofree char *strippedBackingStoreRaw =3D virTestStablePath(elt= ->backingStoreRaw); + g_autofree char *strippedDataFileRaw =3D virTestStablePath(elt->da= taFileRaw); g_autofree char *strippedRelPath =3D virTestStablePath(elt->relPat= h); virBufferAsprintf(&buf, "path:%s\n" "backingStoreRaw: %s\n" "backingStoreRawFormat: %s(%d)\n" + "dataFileRaw: %s\n" "capacity: %lld\n" "encryption: %d\n" "relPath:%s\n" @@ -196,6 +198,7 @@ testStorageChain(const void *args) strippedBackingStoreRaw, NULLSTR(virStorageFileFormatTypeToString(elt->ba= ckingStoreRawFormat)), elt->backingStoreRawFormat, + strippedDataFileRaw, elt->capacity, !!elt->encryption, strippedRelPath, @@ -205,18 +208,17 @@ testStorageChain(const void *args) NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)= ); if (elt->dataFileStore) { - g_autofree char *strippedPathDataFileRaw =3D virTestStablePath= (elt->dataFileRaw); g_autofree char *strippedPathDataFile =3D virTestStablePath(el= t->dataFileStore->path); virBufferAsprintf(&buf, - "dataFileRaw: %s\n\n\n" - "dataFileStoreSource:\n" - "path: %s\n" - "capacity: %lld\n" - "encryption: %d\n" - "type:%s\n" - "format:%s\n", - strippedPathDataFileRaw, + " dataFileStoreSource for '%s':\n" + " path: %s\n" + " capacity: %lld\n" + " encryption: %d\n" + " type:%s\n" + " format:%s\n" + "\n\n", + strippedPath, strippedPathDataFile, elt->dataFileStore->capacity, !!elt->dataFileStore->encryption, diff --git a/tests/virstoragetestdata/out/directory-dir b/tests/virstoraget= estdata/out/directory-dir index c6a2fa3673..ea3bb90191 100644 --- a/tests/virstoragetestdata/out/directory-dir +++ b/tests/virstoragetestdata/out/directory-dir @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/ backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/directory-none b/tests/virstorage= testdata/out/directory-none index c6a2fa3673..ea3bb90191 100644 --- a/tests/virstoragetestdata/out/directory-none +++ b/tests/virstoragetestdata/out/directory-none @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/ backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/directory-raw b/tests/virstoraget= estdata/out/directory-raw index 6e190c97f4..a0b9f882ed 100644 --- a/tests/virstoragetestdata/out/directory-raw +++ b/tests/virstoragetestdata/out/directory-raw @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/ backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw b/= tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw index 0540be0c09..14d9eb987b 100644 --- a/tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw +++ b/tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw @@ -1,6 +1,7 @@ path:ABS_BUILDDIR/virstoragedata/wrap backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative b/tes= ts/virstoragetestdata/out/qcow2-auto_raw-raw-relative index e145cca417..b99f64ee97 100644 --- a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative +++ b/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/qcow2-datafile b/tests/virstorage= testdata/out/qcow2-datafile index d0f46f7e1b..c395f7f65c 100644 --- a/tests/virstoragetestdata/out/qcow2-datafile +++ b/tests/virstoragetestdata/out/qcow2-datafile @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/datafile.qcow2 backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: raw capacity: 1024 encryption: 0 relPath: @@ -9,12 +10,10 @@ format:qcow2 protocol:none hostname: -dataFileRaw: raw - + dataFileStoreSource for 'ABS_SRCDIR/virstoragetestdata/images/datafile.qc= ow2': + path: ABS_SRCDIR/virstoragetestdata/images/raw + capacity: 0 + encryption: 0 + type:file + format:raw -dataFileStoreSource: -path: ABS_SRCDIR/virstoragetestdata/images/raw -capacity: 0 -encryption: 0 -type:file -format:raw diff --git a/tests/virstoragetestdata/out/qcow2-protocol-backing-file b/tes= ts/virstoragetestdata/out/qcow2-protocol-backing-file index d9d4c1316c..d0bf411552 100644 --- a/tests/virstoragetestdata/out/qcow2-protocol-backing-file +++ b/tests/virstoragetestdata/out/qcow2-protocol-backing-file @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2-protocol-backing-file.qcow2 backingStoreRaw: raw backingStoreRawFormat: raw(1) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath:raw diff --git a/tests/virstoragetestdata/out/qcow2-protocol-backing-nbd b/test= s/virstoragetestdata/out/qcow2-protocol-backing-nbd index 360a496ab0..d41a8538a6 100644 --- a/tests/virstoragetestdata/out/qcow2-protocol-backing-nbd +++ b/tests/virstoragetestdata/out/qcow2-protocol-backing-nbd @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2-protocol-backing-nbd.qcow2 backingStoreRaw: nbd+tcp://example.org:6000/blah backingStoreRawFormat: raw(1) +dataFileRaw: capacity: 10485760 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:blah backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw b/tests/virst= oragetestdata/out/qcow2-qcow2_nbd-raw index 0c2bb0ddc4..1ec84d771e 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw +++ b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2_nbd-raw.qcow2 backingStoreRaw: nbd+tcp://example.org:6000/blah backingStoreRawFormat: raw(1) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:blah backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto b/tests/vi= rstoragetestdata/out/qcow2-qcow2_qcow2-auto index 58f1dd6d9e..4b6b4e2283 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto +++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2_qcow2-auto.qcow2 backingStoreRaw: qcow2 backingStoreRawFormat: (-1) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/qcow2 backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 1024 encryption: 0 relPath:qcow2 diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-aut= o b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto index 81263c4bc0..79943f432e 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto +++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2_qcow2-qcow2_qcow2-auto.qco= w2 backingStoreRaw: qcow2_qcow2-auto.qcow2 backingStoreRawFormat: qcow2(14) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/qcow2_qcow2-auto.qcow2 backingStoreRaw: qcow2 backingStoreRawFormat: (-1) +dataFileRaw: capacity: 1024 encryption: 0 relPath:qcow2_qcow2-auto.qcow2 @@ -23,6 +25,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/qcow2 backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 1024 encryption: 0 relPath:qcow2 diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto = b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto index cbb8d6a33f..02e2c5a966 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto +++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2_qcow2-qcow2_raw-auto.qcow2 backingStoreRaw: qcow2_raw-auto.qcow2 backingStoreRawFormat: qcow2(14) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/qcow2_raw-auto.qcow2 backingStoreRaw: raw backingStoreRawFormat: (-1) +dataFileRaw: capacity: 1024 encryption: 0 relPath:qcow2_raw-auto.qcow2 @@ -23,6 +25,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath:raw diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw b= /tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw index de11029922..843a013ef5 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw +++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw @@ -1,6 +1,7 @@ path:ABS_BUILDDIR/virstoragedata/wrap backingStoreRaw: ABS_BUILDDIR/virstoragedata/qcow2 backingStoreRawFormat: qcow2(14) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_BUILDDIR/virstoragedata/qcow2 backingStoreRaw: ABS_BUILDDIR/virstoragedata/raw backingStoreRawFormat: raw(1) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -23,6 +25,7 @@ hostname: path:ABS_BUILDDIR/virstoragedata/raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative b/te= sts/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative index b4bfd432ad..33526cfd48 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative +++ b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 backingStoreRaw: raw backingStoreRawFormat: raw(1) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath:raw diff --git a/tests/virstoragetestdata/out/qcow2-symlinks b/tests/virstorage= testdata/out/qcow2-symlinks index f053f95fd7..c74cf6be53 100644 --- a/tests/virstoragetestdata/out/qcow2-symlinks +++ b/tests/virstoragetestdata/out/qcow2-symlinks @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/sub/link2 backingStoreRaw: ../sub/link1 backingStoreRawFormat: qcow2(14) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/sub/../sub/link1 backingStoreRaw: ../raw backingStoreRawFormat: raw(1) +dataFileRaw: capacity: 1024 encryption: 0 relPath:../sub/link1 @@ -23,6 +25,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/sub/../sub/../raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath:../raw diff --git a/tests/virstoragetestdata/out/qcow2datafile-qcow2_qcow2-datafil= e b/tests/virstoragetestdata/out/qcow2datafile-qcow2_qcow2-datafile index cc8bac3138..c5a5d99e9e 100644 --- a/tests/virstoragetestdata/out/qcow2datafile-qcow2_qcow2-datafile +++ b/tests/virstoragetestdata/out/qcow2datafile-qcow2_qcow2-datafile @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qcow2datafile-datafile.qcow2 backingStoreRaw: datafile.qcow2 backingStoreRawFormat: qcow2(14) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/datafile.qcow2 backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: raw capacity: 1024 encryption: 0 relPath:datafile.qcow2 @@ -20,12 +22,10 @@ format:qcow2 protocol:none hostname: -dataFileRaw: raw - + dataFileStoreSource for 'ABS_SRCDIR/virstoragetestdata/images/datafile.qc= ow2': + path: ABS_SRCDIR/virstoragetestdata/images/raw + capacity: 0 + encryption: 0 + type:file + format:raw -dataFileStoreSource: -path: ABS_SRCDIR/virstoragetestdata/images/raw -capacity: 0 -encryption: 0 -type:file -format:raw diff --git a/tests/virstoragetestdata/out/qed-auto_raw b/tests/virstoragete= stdata/out/qed-auto_raw index 260c3fbc79..3905398142 100644 --- a/tests/virstoragetestdata/out/qed-auto_raw +++ b/tests/virstoragetestdata/out/qed-auto_raw @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qed_raw-raw-relative backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/qed-qed_raw b/tests/virstoragetes= tdata/out/qed-qed_raw index a13d407a5f..5ae7fef357 100644 --- a/tests/virstoragetestdata/out/qed-qed_raw +++ b/tests/virstoragetestdata/out/qed-qed_raw @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/qed_raw-raw-relative backingStoreRaw: raw backingStoreRawFormat: raw(1) +dataFileRaw: capacity: 1024 encryption: 0 relPath: @@ -12,6 +13,7 @@ hostname: path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath:raw diff --git a/tests/virstoragetestdata/out/raw-auto b/tests/virstoragetestda= ta/out/raw-auto index 70ec22f309..5eb1d71681 100644 --- a/tests/virstoragetestdata/out/raw-auto +++ b/tests/virstoragetestdata/out/raw-auto @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: diff --git a/tests/virstoragetestdata/out/raw-raw b/tests/virstoragetestdat= a/out/raw-raw index 70ec22f309..5eb1d71681 100644 --- a/tests/virstoragetestdata/out/raw-raw +++ b/tests/virstoragetestdata/out/raw-raw @@ -1,6 +1,7 @@ path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: backingStoreRawFormat: none(0) +dataFileRaw: capacity: 0 encryption: 0 relPath: --=20 2.49.0