qemu: honour user's nvram path when undefining VM

[PATCH] qemu: honour user's nvram path when undefining VM

Daniel P. Berrangé posted 1 patch 2 years, 2 months ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20220223130130.2084998-1-berrange@redhat.com

src/qemu/qemu_driver.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

Expand all Fold all

[PATCH] qemu: honour user's nvram path when undefining VM

Posted by Daniel P. Berrangé 2 years, 2 months ago

When undefining a VM, we must optionally delete any NVRAM that might
exist. When using firmware auto-select we always check the generated
path, ignoring any user specified path.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/qemu/qemu_driver.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e417d358cd..b74b0375a7 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6615,11 +6615,10 @@ qemuDomainUndefineFlags(virDomainPtr dom,
         }
     }
 
-    if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
+    if (vm->def->os.loader->nvram) {
+        nvram_path = g_strdup(vm->def->os.loader->nvram);
+    } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
-    } else {
-        if (vm->def->os.loader)
-            nvram_path = g_strdup(vm->def->os.loader->nvram);
     }
 
     if (nvram_path && virFileExists(nvram_path)) {
-- 
2.34.1

Re: [PATCH] qemu: honour user's nvram path when undefining VM

Posted by Michal Prívozník 2 years, 2 months ago

On 2/23/22 14:01, Daniel P. Berrangé wrote:
> When undefining a VM, we must optionally delete any NVRAM that might
> exist. When using firmware auto-select we always check the generated
> path, ignoring any user specified path.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  src/qemu/qemu_driver.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

Michal