From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 16 Oct 2023 14:39:46 +0000 (+0200)
Subject: qemu: command: Use 'format' nodename accessors for 'pflash' backend setup
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1baf16fe04fe4f28ad80e78bd7b1a422ff735c9a;p=libvirt.git

qemu: command: Use 'format' nodename accessors for 'pflash' backend setup

The frontend device needs to access the blocks directly so it cares
about the effective nodename.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 40de712c61..d40d3a4e13 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7032,9 +7032,11 @@ qemuBuildMachineCommandLine(virCommand *cmd,
 
     if (virDomainDefHasOldStyleUEFI(def)) {
         if (priv->pflash0)
-            virBufferAsprintf(&buf, ",pflash0=%s", priv->pflash0->nodeformat);
+            virBufferAsprintf(&buf, ",pflash0=%s",
+                              qemuBlockStorageSourceGetEffectiveNodename(priv->pflash0));
         if (def->os.loader->nvram)
-            virBufferAsprintf(&buf, ",pflash1=%s", def->os.loader->nvram->nodeformat);
+            virBufferAsprintf(&buf, ",pflash1=%s",
+                              qemuBlockStorageSourceGetEffectiveNodename(def->os.loader->nvram));
     }
 
     if (virDomainNumaHasHMAT(def->numa))