From nobody Mon Dec 15 23:01:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846304; cv=none; d=zohomail.com; s=zohoarc; b=ceBCiFcyWW78trkBUaW6v3CdsDly2ITQC8MHXw48GO2zVjR2nfm7JIwfxh8DM0svQJ/BF7qVQI6A/tfprjOW/E1goX3Wf1ktkPdAHElDIlbargxZuDrhiy6DTC7nm8GqIoDBKFyrkyQbslyF8fiv+t8LgZ4dWvKMvo1CMnVx3rA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846304; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aGuK7G334Uest6G/Ds3/fgrmnGYVG5xN4PgRq5J9gO0=; b=n+0SQWJa5uccSppmQ1+EnxwFKPf1G/qQvkiKw7DEyOjWA8qTwVA2oSSwFdfGa9fdie7vWNdCy9VCbmUuiudVPpejCiAoIP6geFv6BWuAvNbVb8B+pcBNlOTSjdsc5yENRU2bwJI7ClntBLEyTpU0HY8Rmu7z5+cMZnoIdeyNhlg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658846304600831.1512910855469; Tue, 26 Jul 2022 07:38:24 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-411-191SrL9VN8Cy_hJHEA1iLQ-1; Tue, 26 Jul 2022 10:38:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 964412801792; Tue, 26 Jul 2022 14:38:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E92C90A04; Tue, 26 Jul 2022 14:38:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 25C9C1945DA0; Tue, 26 Jul 2022 14:38:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3AB861945D97 for ; Tue, 26 Jul 2022 14:38:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2DF9C404C324; Tue, 26 Jul 2022 14:38:05 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7ED340CFD0A for ; Tue, 26 Jul 2022 14:38:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846303; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=aGuK7G334Uest6G/Ds3/fgrmnGYVG5xN4PgRq5J9gO0=; b=AgEfupUmjc/8g1JqD3NS+5u1vOfhBFv5yvPeHbA+99ZhGH8kkB4uiUhF/xa5v94bCPzi+y gOF4FvHc8uIv6cam5YWjq2BeEKhP+01sR5kL0g4n+onJxjlfql15FWHZmQ41+JUVknP2AE D41HsCaJJ9WnxVrVAVPIMkMoFfULQVQ= X-MC-Unique: 191SrL9VN8Cy_hJHEA1iLQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/80] qemu: Always assume support for QEMU_CAPS_GLUSTER_DEBUG_LEVEL Date: Tue, 26 Jul 2022 16:36:43 +0200 Message-Id: <5f5b0a65df6c8a7ae750aa14da8e11e6a50b52f3.1658843187.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846306062100003 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Pavel Hrdina --- 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(virStorageSour= ce *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 =3D=3D VIR_STORAGE_TYPE_NETWORK && - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_GLUSTER && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_GLUSTER_DEBUG_LEVEL)) { + src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_GLUSTER) { src->debug =3D true; src->debugLevel =3D 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(virD= omainDiskDef *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, --=20 2.36.1