From c82be99d3b0b75056b882f18d4c952ab588139f8 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 15 Apr 2022 12:32:47 -0700
Subject: [PATCH] fix nvram location for aarch64 kvm driver

---
 pkg/drivers/kvm/domain_definition_arm64.go | 4 ++--
 pkg/drivers/kvm/domain_definition_x86.go   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/drivers/kvm/domain_definition_arm64.go b/pkg/drivers/kvm/domain_definition_arm64.go
index 7e7314945a..9c3f9338d2 100644
--- a/pkg/drivers/kvm/domain_definition_arm64.go
+++ b/pkg/drivers/kvm/domain_definition_arm64.go
@@ -39,9 +39,9 @@ const domainTmpl = `
   </cpu>
 
   <os>
- 	<loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
-    <nvram>/var/lib/libvirt/qemu/nvram/ubuntu_VARS.fd</nvram>  
     <type machine='virt-4.2' arch='aarch64'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
+    <nvram>/usr/share/AAVMF/AAVMF_VARS.fd</nvram>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='no'/>
diff --git a/pkg/drivers/kvm/domain_definition_x86.go b/pkg/drivers/kvm/domain_definition_x86.go
index 3c3e17630c..d384db7378 100644
--- a/pkg/drivers/kvm/domain_definition_x86.go
+++ b/pkg/drivers/kvm/domain_definition_x86.go
@@ -44,7 +44,7 @@ const domainTmpl = `
     <nvram>/usr/share/OVMF/OVMF_VARS.ms.fd</nvram>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
-    <bootmenu enable='yes'/>
+    <bootmenu enable='no'/>
   </os>
   <devices>
     <disk type='file' device='cdrom'>