fix undefining kvm domain

pull/13762/head
Sharif Elgamal 2022-04-07 13:33:01 -07:00
parent dc0b193b74
commit 684c2b4ac4
7 changed files with 2 additions and 9 deletions

View File

@ -1,5 +1,4 @@
//go:build linux //go:build linux
// +build linux
/* /*
Copyright 2018 The Kubernetes Authors All rights reserved. Copyright 2018 The Kubernetes Authors All rights reserved.

View File

@ -1,5 +1,4 @@
//go:build linux //go:build linux
// +build linux
/* /*
Copyright 2016 The Kubernetes Authors All rights reserved. Copyright 2016 The Kubernetes Authors All rights reserved.

View File

@ -1,5 +1,4 @@
//go:build linux && arm64 //go:build linux && arm64
// +build linux,arm64
/* /*
Copyright 2016 The Kubernetes Authors All rights reserved. Copyright 2016 The Kubernetes Authors All rights reserved.

View File

@ -1,5 +1,4 @@
//go:build linux && amd64 //go:build linux && amd64
// +build linux,amd64
/* /*
Copyright 2016 The Kubernetes Authors All rights reserved. Copyright 2016 The Kubernetes Authors All rights reserved.
@ -42,7 +41,7 @@ const domainTmpl = `
<os> <os>
<type machine="q35">hvm</type> <type machine="q35">hvm</type>
<loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> <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='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>

View File

@ -1,5 +1,4 @@
//go:build linux //go:build linux
// +build linux
/* /*
Copyright 2018 The Kubernetes Authors All rights reserved. Copyright 2018 The Kubernetes Authors All rights reserved.

View File

@ -1,5 +1,4 @@
//go:build linux //go:build linux
// +build linux
/* /*
Copyright 2016 The Kubernetes Authors All rights reserved. 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 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 // lvErr will return libvirt Error struct containing specific libvirt error code, domain, message and level

View File

@ -1,5 +1,4 @@
//go:build linux //go:build linux
// +build linux
/* /*
Copyright 2016 The Kubernetes Authors All rights reserved. Copyright 2016 The Kubernetes Authors All rights reserved.