External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Always assume support for QEMU_CAPS_GLUSTER_DEBUG_LEVEL

Browse Source 
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@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-15 16:18:12 +02:00
parent fc0aa62377
commit 73011dd0ab
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_domain.c
View File

@ -7582,22 +7582,19 @@ qemuDomainStorageSourceValidateDepth(virStorageSource *src,
* qemuDomainPrepareStorageSourceConfig: * qemuDomainPrepareStorageSourceConfig:
* @src: storage source to configure * @src: storage source to configure
* @cfg: qemu driver config object * @cfg: qemu driver config object
* @qemuCaps: capabilities of qemu
* *
* Set properties of @src based on the qemu driver config @cfg. * Set properties of @src based on the qemu driver config @cfg.
* *
*/ */
static void static void
qemuDomainPrepareStorageSourceConfig(virStorageSource *src, qemuDomainPrepareStorageSourceConfig(virStorageSource *src,
virQEMUDriverConfig *cfg, virQEMUDriverConfig *cfg)
virQEMUCaps *qemuCaps)
{ {
if (!cfg) if (!cfg)
return; return;
if (src->type == VIR_STORAGE_TYPE_NETWORK && if (src->type == VIR_STORAGE_TYPE_NETWORK &&
src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER && src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) {
virQEMUCapsGet(qemuCaps, QEMU_CAPS_GLUSTER_DEBUG_LEVEL)) {
src->debug = true; src->debug = true;
src->debugLevel = cfg->glusterDebugLevel; src->debugLevel = cfg->glusterDebugLevel;
} }
@ -7717,7 +7714,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
if (qemuDomainValidateStorageSource(n, priv->qemuCaps, isSD) < 0) if (qemuDomainValidateStorageSource(n, priv->qemuCaps, isSD) < 0)
return -1; return -1;
qemuDomainPrepareStorageSourceConfig(n, cfg, priv->qemuCaps); qemuDomainPrepareStorageSourceConfig(n, cfg);
qemuDomainPrepareDiskSourceData(disk, n); qemuDomainPrepareDiskSourceData(disk, n);
if (blockdev && !isSD && if (blockdev && !isSD &&
@ -10767,7 +10764,7 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef *disk,
if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps, true) < 0) if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps, true) < 0)
return -1; return -1;
qemuDomainPrepareStorageSourceConfig(disk->src, cfg, priv->qemuCaps); qemuDomainPrepareStorageSourceConfig(disk->src, cfg);
qemuDomainPrepareDiskSourceData(disk, disk->src); qemuDomainPrepareDiskSourceData(disk, disk->src);
if (qemuDomainSecretStorageSourcePrepare(priv, disk->src, if (qemuDomainSecretStorageSourcePrepare(priv, disk->src,
@ -10805,7 +10802,7 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virDomainDiskDef *disk,
if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0) if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0)
return -1; return -1;
qemuDomainPrepareStorageSourceConfig(src, cfg, priv->qemuCaps); qemuDomainPrepareStorageSourceConfig(src, cfg);
qemuDomainPrepareDiskSourceData(disk, src); qemuDomainPrepareDiskSourceData(disk, src);
if (qemuDomainSecretStorageSourcePrepare(priv, src, if (qemuDomainSecretStorageSourcePrepare(priv, src,