From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 19 Oct 2023 15:52:37 +0000 (+0200)
Subject: qemuBlockStorageSourceGetEffectiveNodename: Prepare for missing 'format' driver
X-Git-Tag: v9.10.0-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834d283bcfa0d877a13bb5a8abf85aa083ae0ada;p=thirdparty%2Flibvirt.git

qemuBlockStorageSourceGetEffectiveNodename: Prepare for missing 'format' driver

Return the effective storage nodename if the format layer is not
present.

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

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 1eb55315ae..c03f278aa9 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -97,7 +97,10 @@ qemuBlockStorageSourceSetFormatNodename(virStorageSource *src,
 const char *
 qemuBlockStorageSourceGetEffectiveNodename(virStorageSource *src)
 {
-    return src->nodenameformat;
+    if (src->nodenameformat)
+        return src->nodenameformat;
+
+    return qemuBlockStorageSourceGetEffectiveStorageNodename(src);
 }