[PATCH 12/31] qemu: Refactor storage backend 'storage' layer helepr object setup

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Use the new nodename accessors for any storage layer helper object.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_domain.c  | 2 +-
 src/qemu/qemu_nbdkit.c  | 4 ++--
 src/qemu/qemu_process.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 885c5ee96b..1b2f09a316 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11106,7 +11106,7 @@ qemuDomainPrepareStorageSourceFDs(virStorageSource *src,

     srcpriv = qemuDomainStorageSourcePrivateFetch(src);

-    srcpriv->fdpass = qemuFDPassNew(src->nodestorage, priv);
+    srcpriv->fdpass = qemuFDPassNew(qemuBlockStorageSourceGetStorageNodename(src), priv);

     for (i = 0; i < fdt->nfds; i++) {
         g_autofree char *idx = g_strdup_printf("%zu", i);
diff --git a/src/qemu/qemu_nbdkit.c b/src/qemu/qemu_nbdkit.c
index 3ad63cfaa0..85e61be44c 100644
--- a/src/qemu/qemu_nbdkit.c
+++ b/src/qemu/qemu_nbdkit.c
@@ -923,7 +923,7 @@ qemuNbdkitStopStorageSource(virStorageSource *src,

         if (priv && priv->nbdkitProcess &&
             qemuNbdkitProcessStop(priv->nbdkitProcess, vm) < 0)
-            VIR_WARN("Unable to stop nbdkit for storage source '%s'", src->nodestorage);
+            VIR_WARN("Unable to stop nbdkit for storage source '%s'", qemuBlockStorageSourceGetStorageNodename(src));
     }
 }

@@ -1173,7 +1173,7 @@ qemuNbdkitProcessStart(qemuNbdkitProcess *proc,

     logfd = qemuLogContextGetWriteFD(logContext);

-    VIR_DEBUG("starting nbdkit process for %s", proc->source->nodestorage);
+    VIR_DEBUG("starting nbdkit process for %s", qemuBlockStorageSourceGetStorageNodename(proc->source));
     virCommandSetErrorFD(cmd, &logfd);
     virCommandSetOutputFD(cmd, &logfd);
     virCommandSetPidFile(cmd, proc->pidfile);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ae0bb7bf80..63c0c62a46 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6771,7 +6771,7 @@ qemuProcessPrepareHostStorageSourceVDPA(virStorageSource *src,

     srcpriv = qemuDomainStorageSourcePrivateFetch(src);

-    srcpriv->fdpass = qemuFDPassNew(src->nodestorage, priv);
+    srcpriv->fdpass = qemuFDPassNew(qemuBlockStorageSourceGetStorageNodename(src), priv);
     qemuFDPassAddFD(srcpriv->fdpass, &vdpafd, "-vdpa");
     return 0;
 }
-- 
2.41.0