From 560e718979cbba6241012cc4bcad3c584ae34eb1 Mon Sep 17 00:00:00 2001
From: Seunguk Shin <seunguk.shin@arm.com>
Date: Thu, 20 Feb 2025 10:29:45 +0000
Subject: [PATCH] runtime: Add edk2 to configuration-qemu.toml for arm64

The edk2 is required for memory hot plug on qemu for arm64.
This adds the edk2 to configuration-qemu.toml for arm64.

Signed-off-by: Seunguk Shin <seunguk.shin@arm.com>
Reviewed-by: Nick Connolly <nick.connolly@arm.com>
---
 src/runtime/Makefile              | 7 +++++++
 src/runtime/arch/arm64-options.mk | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index a80a2a9e69..a3a39183bb 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -464,6 +464,13 @@ ifneq (,$(QEMUCMD))
     DEFSANDBOXCGROUPONLY_NV = true
     # The latest OVMF build should be good for both TDX and SNP
     FIRMWAREPATH_NV := $(PREFIXDEPS)/share/ovmf/OVMF.fd
+
+    ifneq (,$(QEMUFW))
+        FIRMWAREPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFW)
+    endif
+    ifneq (,$(QEMUFWVOL))
+        FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFWVOL)
+    endif
 endif
 
 ifneq (,$(CLHCMD))
diff --git a/src/runtime/arch/arm64-options.mk b/src/runtime/arch/arm64-options.mk
index ca19c8c7a6..749504cfca 100644
--- a/src/runtime/arch/arm64-options.mk
+++ b/src/runtime/arch/arm64-options.mk
@@ -11,6 +11,8 @@ MACHINEACCELERATORS :=
 CPUFEATURES := pmu=off
 
 QEMUCMD := qemu-system-aarch64
+QEMUFW := AAVMF_CODE.fd
+QEMUFWVOL := AAVMF_VARS.fd
 
 # Firecracker binary name
 FCCMD := firecracker