From 684c2b4ac44a9aa231ed5964e0824ac27915bca6 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 7 Apr 2022 13:33:01 -0700
Subject: [PATCH] fix undefining kvm domain

---
 pkg/drivers/kvm/disks.go                   | 1 -
 pkg/drivers/kvm/domain.go                  | 1 -
 pkg/drivers/kvm/domain_definition_arm64.go | 1 -
 pkg/drivers/kvm/domain_definition_x86.go   | 3 +--
 pkg/drivers/kvm/gpu.go                     | 1 -
 pkg/drivers/kvm/kvm.go                     | 3 +--
 pkg/drivers/kvm/network.go                 | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkg/drivers/kvm/disks.go b/pkg/drivers/kvm/disks.go
index dc684c0170..ce9a7ddb08 100644
--- a/pkg/drivers/kvm/disks.go
+++ b/pkg/drivers/kvm/disks.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/domain.go b/pkg/drivers/kvm/domain.go
index 360ae038ac..6a1589e74a 100644
--- a/pkg/drivers/kvm/domain.go
+++ b/pkg/drivers/kvm/domain.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/domain_definition_arm64.go b/pkg/drivers/kvm/domain_definition_arm64.go
index 676fa5b733..7e7314945a 100644
--- a/pkg/drivers/kvm/domain_definition_arm64.go
+++ b/pkg/drivers/kvm/domain_definition_arm64.go
@@ -1,5 +1,4 @@
 //go:build linux && arm64
-// +build linux,arm64
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/domain_definition_x86.go b/pkg/drivers/kvm/domain_definition_x86.go
index 57ac262051..3c3e17630c 100644
--- a/pkg/drivers/kvm/domain_definition_x86.go
+++ b/pkg/drivers/kvm/domain_definition_x86.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
@@ -42,7 +41,7 @@ const domainTmpl = `
   <os>
     <type machine="q35">hvm</type>  
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram>
+    <nvram>/usr/share/OVMF/OVMF_VARS.ms.fd</nvram>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
diff --git a/pkg/drivers/kvm/gpu.go b/pkg/drivers/kvm/gpu.go
index 3722c94e37..5e981efc83 100644
--- a/pkg/drivers/kvm/gpu.go
+++ b/pkg/drivers/kvm/gpu.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2018 The Kubernetes Authors All rights reserved.
diff --git a/pkg/drivers/kvm/kvm.go b/pkg/drivers/kvm/kvm.go
index 7d79a92a1d..96eccb4444 100644
--- a/pkg/drivers/kvm/kvm.go
+++ b/pkg/drivers/kvm/kvm.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
@@ -547,7 +546,7 @@ func (d *Driver) undefineDomain(conn *libvirt.Connect, dom *libvirt.Domain) erro
 		return nil
 	}
 
-	return dom.Undefine()
+	return dom.UndefineFlags(libvirt.DOMAIN_UNDEFINE_NVRAM)
 }
 
 // lvErr will return libvirt Error struct containing specific libvirt error code, domain, message and level
diff --git a/pkg/drivers/kvm/network.go b/pkg/drivers/kvm/network.go
index 835c2c6480..5a21a3abea 100644
--- a/pkg/drivers/kvm/network.go
+++ b/pkg/drivers/kvm/network.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.