[libvirt] [PATCH 23/35] qemu: domain: Tolerate NULL 'cfg' in qemuDomainPrepareDiskSourceChain

Peter Krempa pkrempa at redhat.com
Wed Apr 25 15:15:31 UTC 2018


The function will be reused in the test code where we don't care much
that the gluster debug level can't be populated from the qemu config.

Set the level only when 'cfg' is passed.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 079655de87..564e4e7957 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11881,7 +11881,8 @@ qemuDomainPrepareDiskSourceChain(virDomainDiskDefPtr disk,
     src->detect_zeroes = disk->detect_zeroes;

     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
-        if (n->type == VIR_STORAGE_TYPE_NETWORK &&
+        if (cfg &&
+            n->type == VIR_STORAGE_TYPE_NETWORK &&
             n->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER &&
             virQEMUCapsGet(qemuCaps, QEMU_CAPS_GLUSTER_DEBUG_LEVEL)) {
             n->debug = true;
-- 
2.16.2




More information about the libvir-list mailing list