From nobody Wed Mar 12 17:59:09 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741601523807272.8937088815318; Mon, 10 Mar 2025 03:12:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3FA031BB4; Mon, 10 Mar 2025 06:12:03 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8E5C21C45; Mon, 10 Mar 2025 06:04:25 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AA93F1BCE; Mon, 10 Mar 2025 06:04:19 -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 9F1D41BFA for ; Mon, 10 Mar 2025 06:03:25 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-jp6rPZrwORSN4pRDFTyXnw-1; Mon, 10 Mar 2025 06:03:24 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 40981195605A for ; Mon, 10 Mar 2025 10:03:23 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8292E1800944 for ; Mon, 10 Mar 2025 10:03:22 +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, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,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=1741601005; 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=eDW952UFFhqa4caQjADb4qwc+jXOtLUkxA77ZXvgYh4=; b=FwA4x2REFbc4RrkiBgz9uO3EWUiDvdWU0GavEtnLv9b/CrsHl4qc6aZYC88xbGeXLr7lex OkiIsKDUsKEjL+ZQbZa7dFnBTS2aQ46bjdQJBnZIBWrUpzbj8S60wYpH9sGxkFa0QhGRA+ r5O5wKQoSOoMDIt/Cy9oZWiC+j5bI/0= X-MC-Unique: jp6rPZrwORSN4pRDFTyXnw-1 X-Mimecast-MFC-AGG-ID: jp6rPZrwORSN4pRDFTyXnw_1741601003 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 14/16] qemu: block: Drop 'sheepdog' protocol support Date: Mon, 10 Mar 2025 11:03:01 +0100 Message-ID: <21055f972c4eed390c1aaf0a303252cc928a01a9.1741600167.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: LPtDxeBU4gvZFTdBA74_zXq2kmc82XTAXIalDGSWioE_1741601003 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: I6CSIOJQQG2I3IVG5D2VNRIIF5SM2J6J X-Message-ID-Hash: I6CSIOJQQG2I3IVG5D2VNRIIF5SM2J6J 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741601524862019000 Content-Type: text/plain; charset="utf-8" As now no supported qemu version supports the 'sheepdog' protocol drop the code for configuring the blockdev layer. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 44 ++++++------------------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 35dca8ee7b..eb0621463e 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -765,32 +765,6 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *sr= c, } -static virJSONValue * -qemuBlockStorageSourceGetSheepdogProps(virStorageSource *src) -{ - g_autoptr(virJSONValue) serverprops =3D NULL; - virJSONValue *ret =3D NULL; - - if (src->nhosts !=3D 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("sheepdog protocol accepts only one host")); - return NULL; - } - - if (!(serverprops =3D qemuBlockStorageSourceBuildJSONSocketAddress(&sr= c->hosts[0]))) - return NULL; - - /* libvirt does not support the 'snap-id' and 'tag' properties */ - if (virJSONValueObjectAdd(&ret, - "a:server", &serverprops, - "s:vdi", src->path, - NULL) < 0) - return NULL; - - return ret; -} - - static virJSONValue * qemuBlockStorageSourceGetSshProps(virStorageSource *src) { @@ -1147,12 +1121,6 @@ qemuBlockStorageSourceGetBackendProps(virStorageSour= ce *src, return NULL; break; - case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: - driver =3D "sheepdog"; - if (!(fileprops =3D qemuBlockStorageSourceGetSheepdogProps(src= ))) - return NULL; - break; - case VIR_STORAGE_NET_PROTOCOL_SSH: driver =3D "ssh"; if (!(fileprops =3D qemuBlockStorageSourceGetSshProps(src))) @@ -1165,6 +1133,11 @@ qemuBlockStorageSourceGetBackendProps(virStorageSour= ce *src, return NULL; break; + case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unsupported disk protocol")); + return NULL; + case VIR_STORAGE_NET_PROTOCOL_NONE: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportEnumRangeError(virStorageNetProtocol, src->protocol); @@ -2430,12 +2403,6 @@ qemuBlockStorageSourceCreateGetStorageProps(virStora= geSource *src, return -1; break; - case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: - driver =3D "sheepdog"; - if (!(location =3D qemuBlockStorageSourceGetSheepdogProps(src)= )) - return -1; - break; - case VIR_STORAGE_NET_PROTOCOL_SSH: if (srcPriv->nbdkitProcess) { /* disk creation not yet supported with nbdkit, and even i= f it @@ -2456,6 +2423,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorag= eSource *src, break; /* unsupported/impossible */ + case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_VXHS: --=20 2.48.1