From nobody Thu Nov 21 17:36:07 2024 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1730793973692862.7907228758697; Tue, 5 Nov 2024 00:06:13 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6C64B13A9; Tue, 5 Nov 2024 03:06:12 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 000FE12E4; Tue, 5 Nov 2024 02:59:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8BB0611F2; Tue, 5 Nov 2024 02:58:59 -0500 (EST) 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 5F42512ED for ; Tue, 5 Nov 2024 02:58:26 -0500 (EST) 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-197-7GTEZl8bMy6sSLDPQUs1YA-1; Tue, 05 Nov 2024 02:58:24 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 7B8FB1955BF4 for ; Tue, 5 Nov 2024 07:58:23 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A36483000198 for ; Tue, 5 Nov 2024 07:58:22 +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.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,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=1730793506; 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=qJoamgXETXagcFtjOWpfpxTsW0SbK3H1UCuBwvWGNXk=; b=Qps+sbremERHLtfSSBrPTZsSQK0wON+fzPccl9D68puNfxtHyBYSiVgNtfAvwTWz8sjFVC FRP33nEcNfLcKC0SG+QZZ2wUPY9IOPA3LUlLdmCGguK78Ds3FO7Hk1rTT9ExmOpmgmhe81 FeE86rfthTFxPRXgo344jBy6JcswKSo= X-MC-Unique: 7GTEZl8bMy6sSLDPQUs1YA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 07/13] conf: domain: Output 'format' attribute of '' also for' raw images Date: Tue, 5 Nov 2024 08:58:05 +0100 Message-ID: <30e615f8d979b7b5557132267cd04ffd9d8374f0.1730793407.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FVCXJWL25KR3GJXFAGFGDULXD7GNXIQE X-Message-ID-Hash: FVCXJWL25KR3GJXFAGFGDULXD7GNXIQE 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1730793975309116600 Content-Type: text/plain; charset="utf-8" As the 'format' field is meant to carry the format of the nvram image we should output it even when the image is 'raw'. Currently this is not a problem but later patches will allow mismatch between the nvram format and loader format (as nothing really technically requires them to be the same and this then could become problem). Modify the condition and update tests. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 3 +-- tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml | 2 +- .../aarch64-virt-headless-mmio.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.xml | 2 +- .../firmware-auto-efi-enrolled-keys.x86_64-latest.xml | 2 +- ...re-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml | 2 +- .../firmware-auto-efi-format-loader-raw.aarch64-latest.xml | 2 +- .../firmware-auto-efi-loader-insecure.x86_64-latest.xml | 2 +- .../firmware-auto-efi-loader-path.x86_64-latest.xml | 2 +- .../firmware-auto-efi-loader-secure.x86_64-latest.xml | 2 +- ...ware-auto-efi-loongarch64.loongarch64-latest.abi-update.xml | 2 +- .../firmware-auto-efi-loongarch64.loongarch64-latest.xml | 2 +- .../firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml | 2 +- .../firmware-auto-efi-no-secboot.x86_64-latest.xml | 2 +- .../firmware-auto-efi-nvram-file.x86_64-latest.xml | 2 +- .../firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- .../firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- .../firmware-auto-efi-nvram-path.x86_64-latest.xml | 2 +- .../firmware-auto-efi-nvram-template.x86_64-latest.xml | 2 +- .../firmware-auto-efi-secboot.x86_64-latest.xml | 2 +- .../firmware-auto-efi-smm-off.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml | 2 +- ...firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml | 2 +- .../firmware-manual-efi-acpi-aarch64.aarch64-latest.xml | 2 +- .../firmware-manual-efi-acpi-q35.x86_64-latest.xml | 2 +- .../firmware-manual-efi-features.x86_64-latest.xml | 2 +- ...rmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml | 2 +- .../firmware-manual-efi-loader-secure.x86_64-latest.xml | 2 +- ...-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml | 2 +- .../firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml | 2 +- ...rmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml | 2 +- .../firmware-manual-efi-no-secboot.x86_64-latest.xml | 2 +- .../firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml | 2 +- .../firmware-manual-efi-nvram-file.x86_64-latest.xml | 2 +- .../firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- .../firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- ...are-manual-efi-nvram-template-nonstandard.x86_64-latest.xml | 2 +- .../firmware-manual-efi-nvram-template.x86_64-latest.xml | 2 +- .../firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml | 2 +- .../firmware-manual-efi-secboot.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml | 2 +- .../hvf-aarch64-virt-headless.aarch64-latest.xml | 2 +- .../qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml | 2 +- .../pvpanic-pci-no-address-aarch64.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml | 2 +- 47 files changed, 47 insertions(+), 48 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 744bc1ac34..9d2aeb1086 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26833,8 +26833,7 @@ virDomainLoaderDefFormatNvram(virBuffer *buf, return -1; } - if (src->format && - src->format !=3D VIR_STORAGE_FILE_RAW) { + if (src->format !=3D VIR_STORAGE_FILE_NONE) { virBufferEscapeString(&attrBuf, " format=3D'%s'", virStorageFileFormatTypeToString(src->fo= rmat)); } diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml= b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml index f6cfe2b63c..31a5165fc3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml @@ -16,7 +16,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /path/to/guest_VARS.raw + /path/to/guest_VARS.raw diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-lates= t.xml b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml index 56d40b0a9d..dc2bce05dc 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml @@ -16,7 +16,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /path/to/guest_VARS.raw + /path/to/guest_VARS.raw diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml= b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml index c8fa37a644..24edcc5ab3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml @@ -16,7 +16,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /path/to/guest_VARS.raw + /path/to/guest_VARS.raw diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest= .xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml index c6f3a5fe6b..e07881f8cf 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS= .fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-l= atest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-la= test.xml index 729d2d911d..e454303158 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.x= ml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.x= ml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarc= h64-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-= loader-raw.aarch64-latest.abi-update.xml index 195b446a0a..44ef2c89f9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.abi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.abi-update.xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/guest_VARS.raw + /var/lib/libvirt/qemu/nvram/guest_VARS= .raw diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarc= h64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.= aarch64-latest.xml index c6f3a5fe6b..e07881f8cf 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS= .fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64= -latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_6= 4-latest.xml index 6690c45940..f3c93e648a 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest= .xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest= .xml @@ -11,7 +11,7 @@ /usr/share/edk2= /ovmf/OVMF_CODE.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-lat= est.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest= .xml index 430613f5fd..9ad97a9c37 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-la= test.xml index 729d2d911d..e454303158 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.x= ml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.x= ml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch6= 4-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch= 64.loongarch64-latest.abi-update.xml index 8ba1bd0f81..6137d3448b 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.abi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.abi-update.xml @@ -11,7 +11,7 @@ /usr/share/edk2/loongarch64/Q= EMU_EFI.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch6= 4-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarc= h64-latest.xml index 8ba1bd0f81..6137d3448b 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.xml @@ -11,7 +11,7 @@ /usr/share/edk2/loongarch64/Q= EMU_EFI.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_6= 4-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86= _64-latest.xml index 53381bd10e..875943f097 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-lates= t.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-lates= t.xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.x= ml index 430613f5fd..9ad97a9c37 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.x= ml index 1672edd458..317868a136 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - + diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x8= 6_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-isc= si.x86_64-latest.xml index 23ff713347..da5816f3cd 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.xml @@ -10,7 +10,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - + diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_= 64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x= 86_64-latest.xml index a318069d1d..3fc9b5f79c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.xml @@ -10,7 +10,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - + diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.x= ml index 94dd6a29b9..d0eea64666 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /path/to/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-= latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-= latest.xml index 53381bd10e..875943f097 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.= xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.= xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.= xml b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml index 729d2d911d..e454303158 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.= xml b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml index c53e9f9692..5fc4a8c5cc 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml b/te= sts/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml index 729d2d911d..e454303158 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths= .aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-leg= acy-paths.aarch64-latest.xml index c4ab86c675..293ffb95bd 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.xml @@ -7,7 +7,7 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64= -latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch6= 4-latest.xml index 0dc32d0ce9..8dc07ab101 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest= .xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest= .xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /path/to/guest_VARS.raw + /path/to/guest_VARS.raw diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.x= ml index e7b764b9b0..ee3f0c5331 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /path/to/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.x= ml index 67d90c4b1c..05cd789c27 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstand= ard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-pa= th-nonstandard.x86_64-latest.xml index 039c485706..09a0ef382e 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.xml @@ -7,7 +7,7 @@ hvm /path/to/OVMF_CODE.fd - /var/lib/libvirt/qemu/nvram/= guest_VARS.fd + /var/lib/libv= irt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64= -latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_6= 4-latest.xml index a8c52c9819..d14adaea21 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest= .xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest= .xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /path/to/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-leg= acy-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-= enrolled-keys-legacy-paths.x86_64-latest.xml index 7e2b963537..7258679199 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.xml @@ -7,7 +7,7 @@ hvm /usr/share/OVM= F/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86= _64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys= .x86_64-latest.xml index dd69b42726..b1b3a268cb 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /path/to/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-pa= ths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboo= t-legacy-paths.x86_64-latest.xml index cd48e5e7b9..f89b371a4c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.xml @@ -7,7 +7,7 @@ hvm /usr/share/OVMF/OVMF_CODE.fd<= /loader> - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-la= test.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-late= st.xml index e7b764b9b0..ee3f0c5331 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /path/to/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch= 64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aa= rch64-latest.xml index fd217afb89..4e14737696 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-late= st.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-late= st.xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /path/to/guest_VARS.raw + /path/to/guest_VARS.raw diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-la= test.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-late= st.xml index 1672edd458..317868a136 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - + diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.= x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network= -iscsi.x86_64-latest.xml index 23ff713347..da5816f3cd 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.xml @@ -10,7 +10,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - + diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x8= 6_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-n= bd.x86_64-latest.xml index a318069d1d..3fc9b5f79c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.xml @@ -10,7 +10,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - + diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-= template-nonstandard.x86_64-latest.xml index 5433650516..f8de279178 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.xml @@ -7,7 +7,7 @@ hvm /usr/share/edk2/ovmf/OVMF_COD= E.fd - /var/lib/libvirt/qemu/nvram/= guest_VARS.fd + /var/lib/libv= irt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_6= 4-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86= _64-latest.xml index 67d90c4b1c..05cd789c27 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths= .x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-lega= cy-paths.x86_64-latest.xml index e6db577de4..72dfc6feb1 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.xml @@ -7,7 +7,7 @@ hvm /usr/share/OVM= F/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-lates= t.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml index a8c52c9819..d14adaea21 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /path/to/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml b/= tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml index 4615cd8db8..e92738ef10 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/ovmf/OVMF_COD= E.fd - /path/to/guest_VARS.fd + /path/to/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest= .xml b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.xml index f26cce3028..375879256e 100644 --- a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/test_VARS.fd + /var/lib/libvirt/qemu/nvram/test_VARS.= fd diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xm= l b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml index 2291362b53..316d6bd9ea 100644 --- a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk= 2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/test_VARS.fd + /var/lib/libvirt/qemu/nvram/test_VARS.fd diff --git a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml b= /tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml index 5db6e99736..9da2f68224 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS= .fd diff --git a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-l= atest.xml b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-la= test.xml index eabe7c0b4d..5296fbb414 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.x= ml +++ b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.x= ml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS= .fd diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml = b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml index 398ae4e3de..de5e747cf2 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml @@ -11,7 +11,7 @@ /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS= .fd --=20 2.47.0