From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 19 Apr 2018 13:54:18 +0000 (+0200)
Subject: qemu: domain: Tolerate NULL 'cfg' in qemuDomainPrepareDiskSourceChain
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=30a772170221f885e6d591bfc4e0cd2828e79dfc;p=libvirt.git

qemu: domain: Tolerate NULL 'cfg' in qemuDomainPrepareDiskSourceChain

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@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f732639cb1..b13e6d8ca4 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11871,7 +11871,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;