Added firmware scanning directory mapping for libvirt XML

Signed-off-by: duyiwei <duyiwei@kylinos.cn>

edk2-aarch64-verbose-raw.json

@@ -0,0 +1,31 @@
+{
+    "description": "UEFI firmware for ARM64 virtual machines, verbose logs",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2/aarch64/vars-template-pflash.raw",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "aarch64",
+            "machines": [
+                "virt-*"
+            ]
+        }
+    ],
+    "features": [
+        "verbose-static"
+    ],
+    "tags": [
+
+    ]
+}

edk2-ovmf-x64-nosb.json

@@ -0,0 +1,35 @@
+{
+    "description": "OVMF without SB+SMM, empty varstore",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "mode": "split",
+        "executable": {
+            "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "x86_64",
+            "machines": [
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "acpi-s3",
+        "amd-sev",
+        "amd-sev-es",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}

edk2.spec

@@ -7,7 +7,7 @@
 
 Name: edk2
 Version: %{stable_date}
-Release: 1
+Release: 2
 Summary: EFI Development Kit II
 License: BSD-2-Clause-Patent and OpenSSL and MIT 
 URL: https://github.com/tianocore/edk2
@@ -15,6 +15,8 @@ Source0: https://github.com/tianocore/edk2/archive/%{release_tag}.tar.gz
 Source1: openssl.%{openssl_commitid}.tar.gz
 Source2: brotli.%{brotli_commitid}.tar.gz
 Source3: public-mipi-sys-t.%{public_mipi_sys_t_commitid}.tar.gz
+Source4: edk2-aarch64-verbose-raw.json
+Source5: edk2-ovmf-x64-nosb.json
 
 patch0: 0001-OvmfPkg-VirtioNetDxe-Extend-the-RxBufferSize-to-avoi.patch
 patch1: 0002-add-Wno-maybe-uninitialized-to-fix-build-error.patch
@@ -83,6 +85,8 @@ tar -xf %{SOURCE3} -C MdePkg/Library/MipiSysTLib/mipisyst --strip-components=1
 
 %autopatch -p1
 
+cp -a -- %{SOURCE4} %{SOURCE5} .
+
 %build
 NCPUS=`/usr/bin/getconf _NPROCESSORS_ONLN`
 BUILD_OPTION="-t GCC5 -n $NCPUS -b RELEASE"
@@ -118,7 +122,8 @@ build $BUILD_OPTION
 cp CryptoPkg/Library/OpensslLib/openssl/LICENSE.txt LICENSE.openssl
 mkdir -p %{buildroot}%{_bindir} \
          %{buildroot}%{_datadir}/%{name}/Conf \
-         %{buildroot}%{_datadir}/%{name}/Scripts
+         %{buildroot}%{_datadir}/%{name}/Scripts \
+         %{buildroot}%{_datadir}/qemu/firmware
 install BaseTools/Source/C/bin/* %{buildroot}%{_bindir}
 install BaseTools/BuildEnv %{buildroot}%{_datadir}/%{name}
 install BaseTools/Conf/*.template %{buildroot}%{_datadir}/%{name}/Conf
@@ -155,11 +160,13 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys
     dd of="%{buildroot}/usr/share/%{name}/aarch64/QEMU_EFI-pflash.raw" if="/dev/zero" bs=1M count=64
     dd of="%{buildroot}/usr/share/%{name}/aarch64/QEMU_EFI-pflash.raw" if="%{buildroot}/usr/share/%{name}/aarch64/QEMU_EFI.fd" conv=notrunc
     dd of="%{buildroot}/usr/share/%{name}/aarch64/vars-template-pflash.raw" if="/dev/zero" bs=1M count=64
+    install -m 0644 edk2-aarch64-verbose-raw.json %{buildroot}%{_datadir}/qemu/firmware/10-edk2-aarch64-verbose-raw.json
 %endif
 
 %ifarch x86_64
     mkdir -p %{buildroot}/usr/share/%{name}/ovmf
     cp Build/OvmfX64/*/FV/OVMF*.fd %{buildroot}/usr/share/%{name}/ovmf
+    install -m 0644 edk2-ovmf-x64-nosb.json %{buildroot}%{_datadir}/qemu/firmware/10-edk2-ovmf-x64-nosb.json
 %endif
 
 %ifarch %{ix86}
@@ -222,6 +229,7 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys
 %dir /usr/share/%{name}/aarch64
 /usr/share/%{name}/aarch64/QEMU*.fd
 /usr/share/%{name}/aarch64/*.raw
+%{_datadir}/qemu/firmware/10-edk2-aarch64-verbose-raw.json
 %endif
 
 %ifarch x86_64
@@ -230,6 +238,7 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys
 %license LICENSE.openssl
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/ovmf
+%{_datadir}/qemu/firmware/10-edk2-ovmf-x64-nosb.json
 %endif
 
 %ifarch %{ix86}
@@ -248,6 +257,9 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys
 %endif
 
 %changelog
+* Thu Jan 25 2024 duyiwei <duyiwei@kylinos.cn> - 202308-2
+- Added firmware scanning directory mapping for libvirt XML
+
 * Mon Aug 28 2023 wangliu<wangliu@iscas.ac.cn> - 202308-1
 - update edk2 to stable202308