From nobody Tue Sep 9 02:54:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1748332253; cv=none; d=zohomail.com; s=zohoarc; b=V4eKQ27WdKNEse318elHHIayeo6X3Kn38qUKsJttC349X3MhzGVdD2uwFO85HNQBmG/fpMLzOOXpp9VQD51wc3GB08ACVexHd0T+Ecn1onpUXexEl4nPHSMn1YX/qZDJ9arjNIacYKNefj/AVC1olebZL6sNjF8C8/ZIc8ham78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748332253; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=LBHankOcVOUnVHuZVDFARJLt33+Szkj9PSufmRVYyn4=; b=DAtGijzIWhR8SE5reGe1p4kO//vLSLMoemrbB8mI9zXxhfyBaHCLfLfaxTYVXIEDl0T/KsTNHOqifmZ/mLKEL+GaGLAbvlNv/+NYCe2rg1gaqM4vJ7Kc/BHA8B5kyK20ZZxLdM+qDiDEdmvuoeLE1cuLfrj9Vkx4CYzxmjCvT+4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1748332252964195.0121816650818; Tue, 27 May 2025 00:50:52 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EF272178B; Tue, 27 May 2025 03:50:51 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CFF6916F8; Tue, 27 May 2025 03:49:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5C71114BA; Tue, 27 May 2025 03:49:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 20CC315F2 for ; Tue, 27 May 2025 03:49:16 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-156-_N4vGYqpOMuO4thyZmqCTQ-1; Tue, 27 May 2025 03:49:12 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 95170180045C for ; Tue, 27 May 2025 07:49:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.3]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CD898180047F for ; Tue, 27 May 2025 07:49:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748332155; h=from:from: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; bh=AVuDT4mBWViavCk3Pdy9tLKHbPChUgBxXWAijxy1Szg=; b=Jp0B3js+5QcJFzP9NnXrgHJNdiVagJb7LtXduOwOTRomyFtiivO7TXIyzP6bkVt4Y37ZZz +xLLICOLf0QVZhQPnciO3WG5rq+sGh9souRExVRKyxAWpLMuHW3JK/IKH52YLOQxRSHgm0 jsiMp05dvhtjoHx500LdrgWFOmh1KCU= X-MC-Unique: _N4vGYqpOMuO4thyZmqCTQ-1 X-Mimecast-MFC-AGG-ID: _N4vGYqpOMuO4thyZmqCTQ_1748332151 To: devel@lists.libvirt.org Subject: [PATCH 3/9] qemu: block: Drop code for 'vxhs' storage protocol Date: Tue, 27 May 2025 09:48:59 +0200 Message-ID: <5fa0e16fc439bc997aaee9acdc445750364826ae.1748332058.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 48iOxoE4-gEegPjTfUxQP4aS7uY4W7AzAYMynu-mg-M_1748332151 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JKVTOU4F5RJF4PI25ETVMPYGKB5BBKPG X-Message-ID-Hash: JKVTOU4F5RJF4PI25ETVMPYGKB5BBKPG X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1748332255855116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa qemu-5.2 dropped support for the 'vxhs' protocol. We require qemu-5.2 since commit ce48d584cc4 and thus the block code for vxhs is now dead. Remove it. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 41 +---------------------------------------- src/qemu/qemu_domain.c | 37 +------------------------------------ 2 files changed, 2 insertions(+), 76 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index b1f50b6c67..32568d4ae6 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -426,41 +426,6 @@ qemuBlockStorageSourceGetGlusterProps(virStorageSource= *src, } -static virJSONValue * -qemuBlockStorageSourceGetVxHSProps(virStorageSource *src, - bool onlytarget) -{ - g_autoptr(virJSONValue) server =3D NULL; - const char *tlsAlias =3D src->tlsAlias; - virJSONValue *ret =3D NULL; - - if (src->nhosts !=3D 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("VxHS protocol accepts only one host")); - return NULL; - } - - if (!(server =3D qemuBlockStorageSourceBuildJSONInetSocketAddress(&src= ->hosts[0]))) - return NULL; - - if (onlytarget) - tlsAlias =3D NULL; - - /* VxHS disk specification example: - * { driver:"vxhs", - * tls-creds:"objvirtio-disk0_tls0", - * vdisk-id:"eb90327c-8302-4725-4e85ed4dc251", - * server:{type:"tcp", host:"1.2.3.4", port:9999}} - */ - ignore_value(virJSONValueObjectAdd(&ret, - "S:tls-creds", tlsAlias, - "s:vdisk-id", src->path, - "a:server", &server, NULL)); - - return ret; -} - - static virJSONValue * qemuBlockStorageSourceGetNFSProps(virStorageSource *src) { @@ -1088,11 +1053,6 @@ qemuBlockStorageSourceGetBackendProps(virStorageSour= ce *src, return NULL; break; - case VIR_STORAGE_NET_PROTOCOL_VXHS: - driver =3D "vxhs"; - if (!(fileprops =3D qemuBlockStorageSourceGetVxHSProps(src, on= lytarget))) - return NULL; - break; case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: @@ -1134,6 +1094,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourc= e *src, return NULL; break; + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unsupported disk protocol")); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 230dc86038..ace42b516a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8798,40 +8798,6 @@ qemuDomainPrepareChardevSourceOne(virDomainDeviceDef= *dev, } -static int -qemuProcessPrepareStorageSourceTLSVxhs(virStorageSource *src, - virQEMUDriverConfig *cfg, - qemuDomainObjPrivate *priv, - const char *parentAlias) -{ - /* VxHS uses only client certificates and thus has no need for - * the server-key.pem nor a secret that could be used to decrypt - * the it, so no need to add a secinfo for a secret UUID. */ - if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_ABSENT) { - if (cfg->vxhsTLS) - src->haveTLS =3D VIR_TRISTATE_BOOL_YES; - else - src->haveTLS =3D VIR_TRISTATE_BOOL_NO; - src->tlsFromConfig =3D true; - } - - if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { - src->tlsAlias =3D qemuAliasTLSObjFromSrcAlias(parentAlias); - src->tlsCertdir =3D g_strdup(cfg->vxhsTLSx509certdir); - - if (cfg->vxhsTLSx509secretUUID) { - qemuDomainStorageSourcePrivate *srcpriv =3D qemuDomainStorageS= ourcePrivateFetch(src); - - if (!(srcpriv->tlsKeySecret =3D qemuDomainSecretInfoTLSNew(pri= v, src->tlsAlias, - cfg->= vxhsTLSx509secretUUID))) - return -1; - } - } - - return 0; -} - - static int qemuProcessPrepareStorageSourceTLSNBD(virStorageSource *src, virQEMUDriverConfig *cfg, @@ -8958,8 +8924,7 @@ qemuDomainPrepareStorageSourceTLS(virStorageSource *s= rc, switch ((virStorageNetProtocol) src->protocol) { case VIR_STORAGE_NET_PROTOCOL_VXHS: - if (qemuProcessPrepareStorageSourceTLSVxhs(src, cfg, priv, parentA= lias) < 0) - return -1; + /* vxhs is no longer supported */ break; case VIR_STORAGE_NET_PROTOCOL_NBD: --=20 2.49.0