[PATCH 05/80] qemu: Always assume support for QEMU_CAPS_GLUSTER_DEBUG_LEVEL
The 'debug' level for the gluster driver was added in qemu-2.8
unconditionally so libvirt can always assume it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 7df8041adf..534de9e0ae 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7667,22 +7667,19 @@ qemuDomainStorageSourceValidateDepth(virStorageSource *src,
* qemuDomainPrepareStorageSourceConfig:
* @src: storage source to configure
* @cfg: qemu driver config object
- * @qemuCaps: capabilities of qemu
*
* Set properties of @src based on the qemu driver config @cfg.
*
*/
static void
qemuDomainPrepareStorageSourceConfig(virStorageSource *src,
- virQEMUDriverConfig *cfg,
- virQEMUCaps *qemuCaps)
+ virQEMUDriverConfig *cfg)
{
if (!cfg)
return;
if (src->type == VIR_STORAGE_TYPE_NETWORK &&
- src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_GLUSTER_DEBUG_LEVEL)) {
+ src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) {
src->debug = true;
src->debugLevel = cfg->glusterDebugLevel;
}
@@ -7802,7 +7799,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
if (qemuDomainValidateStorageSource(n, priv->qemuCaps, isSD) < 0)
return -1;
- qemuDomainPrepareStorageSourceConfig(n, cfg, priv->qemuCaps);
+ qemuDomainPrepareStorageSourceConfig(n, cfg);
qemuDomainPrepareDiskSourceData(disk, n);
if (blockdev && !isSD &&
@@ -10864,7 +10861,7 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef *disk,
if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps, true) < 0)
return -1;
- qemuDomainPrepareStorageSourceConfig(disk->src, cfg, priv->qemuCaps);
+ qemuDomainPrepareStorageSourceConfig(disk->src, cfg);
qemuDomainPrepareDiskSourceData(disk, disk->src);
if (qemuDomainSecretStorageSourcePrepare(priv, disk->src,
@@ -10902,7 +10899,7 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virDomainDiskDef
*disk,
if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0)
return -1;
- qemuDomainPrepareStorageSourceConfig(src, cfg, priv->qemuCaps);
+ qemuDomainPrepareStorageSourceConfig(src, cfg);
qemuDomainPrepareDiskSourceData(disk, src);
if (qemuDomainSecretStorageSourcePrepare(priv, src,
--
2.36.1