From nobody Fri Apr 19 11:41:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1590041326; cv=none; d=zohomail.com; s=zohoarc; b=h0vDZzF9XJ+N8UWPYrajLk+xLyt3vZXHnNEx2JxlH8lOuDamJdT5KTLvSon4IR+QXqM1K12pjeR9eSJaF2Em0mo3un2gR32N/X4yQ57EWzr98WpELHjdzj9zhdRNuMoqubHuKXlmdlJmEWZTxHKatXhLHIYyTd7SPemQVJfkCNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590041326; h=Content-Type:Content-Transfer-Encoding:Cc: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=r6iqJjNhV3nWzPe0Z6xwcWHqg+79VW7ou87dyxSUjvI=; b=kdWg3Lw4+rBuFTJmEzKyERDYPrKavnQPc3RDIuN/KiYZ8135CkKbXvj8DBtRLtxjIwnSJsY53VKeHEv30OH3JTHkAAvYn1BV1hm0g+Dkg5SxAqUtSUZxgJQm7mzUrCnpNYJglvJdy6K0EoR2R1DstjjyWpMVsuNOFcLUleIRfw0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1590041326414803.9321658509126; Wed, 20 May 2020 23:08:46 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-70-l8mTOFlpMvyJOIFIO2R9XQ-1; Thu, 21 May 2020 02:08:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 949841853C66; Thu, 21 May 2020 06:08:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F07019C4F; Thu, 21 May 2020 06:08:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 74E5F4EDBB; Thu, 21 May 2020 06:08:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04L68VXk001393 for ; Thu, 21 May 2020 02:08:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C17E5D9CC; Thu, 21 May 2020 06:08:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-200.pek2.redhat.com [10.72.13.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id F19C35D9C9; Thu, 21 May 2020 06:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590041325; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=r6iqJjNhV3nWzPe0Z6xwcWHqg+79VW7ou87dyxSUjvI=; b=Qae3ihukFjlezgUTi3gyrWkjCtpI3lVvkNtCGxn/StQehwUUbfUn2qS12Dkv8FjtG2JXEN fPx4q2KP71MkksxbnKXDwN5F28h9uU3JIZJq60nzr2rgo5kBZIjXh+3ZVcL2p15JBYiao1 ta7PwlYSDNV4NVhecvh7LX/8h1IAgyk= X-MC-Unique: l8mTOFlpMvyJOIFIO2R9XQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH 1/3] docs: Remove tftp protocol support from docs Date: Thu, 21 May 2020 14:08:18 +0800 Message-Id: <20200521060820.156471-2-hhan@redhat.com> In-Reply-To: <20200521060820.156471-1-hhan@redhat.com> References: <20200521060820.156471-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Han Han --- docs/formatdomain.html.in | 10 +--------- docs/schemas/domaincommon.rng | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 23eb0292..cadb64b2 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2952,14 +2952,6 @@ <target dev=3D'hdh' bus=3D'ide' tray=3D'open'/> <readonly/> </disk> - <disk type=3D'network' device=3D'cdrom'> - <driver name=3D'qemu' type=3D'raw'/> - <source protocol=3D"tftp" name=3D"url_path"> - <host name=3D"hostname" port=3D"69"/> - </source> - <target dev=3D'hdi' bus=3D'ide' tray=3D'open'/> - <readonly/> - </disk> <disk type=3D'block' device=3D'lun'> <driver name=3D'qemu' type=3D'raw'/> <source dev=3D'/dev/sda'> @@ -3166,7 +3158,7 @@ The protocol attribute specifies the protocol to access to the requested image. Possible values are "nbd", "iscsi", "rbd", "sheepdog", "gluster", "vxhs", "http", "http= s", - "ftp", ftps", or "tftp". + "ftp", ftps". =20

For any protocol other than nbd an additional attribute name diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9d60b090..c93b150d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1942,7 +1942,6 @@ sheepdog ftp - tftp --=20 2.25.0 From nobody Fri Apr 19 11:41:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1590041340; cv=none; d=zohomail.com; s=zohoarc; b=G/rjeXUOgGqJM3pRXasK1F8Sh+Mx5gvxFYkTm0Y3K18Y16C/A8DgDtoLLtRfXKFZJBdjEf4d1LPc1/ZcY+K6Udz9U7wya4YigvdPIrosFNYpi97PyDRcV9x5tVVaTkBRVwGHnl04FYFn9SGPKcIrMFexyTl5lf6ciaTl71RWIb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590041340; h=Content-Type:Content-Transfer-Encoding:Cc: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=hThj2NjPgFthdlTyBMPSCxQaJAuHTylCFvn/NqF+sNE=; b=b+HmAqT0J10DFToUwwLP1oxQDFk6yaJLp3j741GRzouB7q7voHDLjIg/jip5uNfC5Hjy7KD+mIHpaH3QY3Swtv8RmgIsCYy/ioJ1jGHc1BV7rfxE++0RY8JItrneUl4qhkOUXlr5eSv1I/rJek51Lw7pkyzHI1HdJh5jhfTRj5c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1590041340537450.6485390318421; Wed, 20 May 2020 23:09:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-5-F4Zj4yFDPY2Y8-E2DaYOKQ-1; Thu, 21 May 2020 02:08:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DF651835B50; Thu, 21 May 2020 06:08:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD8DA60C87; Thu, 21 May 2020 06:08:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 90C344EDB8; Thu, 21 May 2020 06:08:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04L68au9001406 for ; Thu, 21 May 2020 02:08:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 788565D9CC; Thu, 21 May 2020 06:08:36 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-200.pek2.redhat.com [10.72.13.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D34A5D9CA; Thu, 21 May 2020 06:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590041339; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=hThj2NjPgFthdlTyBMPSCxQaJAuHTylCFvn/NqF+sNE=; b=iWKAgq7G3uIuleS12DzLs2BGBWql/cEYTpROkpUUsxMSglJStVFlejmk1by74vWGbOqWIM KWaKE6FLtUrc/DmT0xTDjasUHuL+jasJXxRQNwT3kNqkmqbx0LkSTePWSwcheezyVQK+aX PusUWWyYmwOVkhXReNSOrMCxCObl970= X-MC-Unique: F4Zj4yFDPY2Y8-E2DaYOKQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH 2/3] src: Remove tftp network storage support Date: Thu, 21 May 2020 14:08:19 +0800 Message-Id: <20200521060820.156471-3-hhan@redhat.com> In-Reply-To: <20200521060820.156471-1-hhan@redhat.com> References: <20200521060820.156471-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" As for libxl driver, libvirt pops up unsupported error when using tftp. For qemu driver, tftp is dropped since v2.8. Besides, tftp is completely unusable before v2.8 [1]. So let's remove all the tftp support. [1]: https://bugzilla.redhat.com/show_bug.cgi?id=3D1372143#c2 Signed-off-by: Han Han --- src/libxl/libxl_conf.c | 1 - src/libxl/xen_xl.c | 1 - src/qemu/qemu_block.c | 3 --- src/qemu/qemu_command.c | 1 - src/qemu/qemu_domain.c | 11 ----------- src/qemu/qemu_driver.c | 3 --- src/util/virstoragefile.c | 6 ------ src/util/virstoragefile.h | 1 - 8 files changed, 27 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a0059fc2..cc80c063 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -920,7 +920,6 @@ libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index d40c2e1d..38412038 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1572,7 +1572,6 @@ xenFormatXLDiskSrcNet(virStorageSourcePtr src) case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 6f9c7071..a5c06e60 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1137,7 +1137,6 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourc= ePtr src, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: driver =3D virStorageNetProtocolTypeToString(src->protocol); if (!(fileprops =3D qemuBlockStorageSourceGetCURLProps(src, on= lytarget))) return NULL; @@ -2076,7 +2075,6 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr sr= c, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: if (!(uri =3D qemuBlockStorageSourceGetURI(src))) @@ -2480,7 +2478,6 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorag= eSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_NONE: case VIR_STORAGE_NET_PROTOCOL_LAST: return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 419eca56..3c4b1fa6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -966,7 +966,6 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: ret =3D qemuBuildNetworkDriveURI(src, secinfo); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d5e3d1a3..02306c9e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5319,16 +5319,6 @@ qemuDomainValidateStorageSource(virStorageSourcePtr = src, return -1; } =20 - /* TFTP protocol was not supported for some time, lock it out at least= with - * -blockdev */ - if (actualType =3D=3D VIR_STORAGE_TYPE_NETWORK && - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_TFTP && - blockdev) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'tftp' protocol is not supported with this QEMU = binary")); - return -1; - } - return 0; } =20 @@ -10694,7 +10684,6 @@ qemuDomainPrepareStorageSourceTLS(virStorageSourceP= tr src, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: if (src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dd9ae30b..b8850bd0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14556,7 +14556,6 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDo= mainSnapshotDiskDefPtr snapdi case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: @@ -14644,7 +14643,6 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDoma= inObjPtr vm, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: @@ -14774,7 +14772,6 @@ qemuDomainSnapshotPrepareDiskInternal(virDomainDisk= DefPtr disk, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 535a94e2..e5e3c9f1 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -87,7 +87,6 @@ VIR_ENUM_IMPL(virStorageNetProtocol, "https", "ftp", "ftps", - "tftp", "ssh", "vxhs", ); @@ -3159,7 +3158,6 @@ virStorageSourceParseBackingColon(virStorageSourcePtr= src, case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SSH: @@ -3868,7 +3866,6 @@ static const struct virStorageSourceJSONDriverParser = jsonParsers[] =3D { {"https", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_= PROTOCOL_HTTPS}, {"ftp", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PR= OTOCOL_FTP}, {"ftps", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_P= ROTOCOL_FTPS}, - {"tftp", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_P= ROTOCOL_TFTP}, {"gluster", false, virStorageSourceParseBackingJSONGluster, 0}, {"iscsi", false, virStorageSourceParseBackingJSONiSCSI, 0}, {"nbd", false, virStorageSourceParseBackingJSONNbd, 0}, @@ -4637,9 +4634,6 @@ virStorageSourceNetworkDefaultPort(virStorageNetProto= col protocol) case VIR_STORAGE_NET_PROTOCOL_FTPS: return 990; =20 - case VIR_STORAGE_NET_PROTOCOL_TFTP: - return 69; - case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: return 7000; =20 diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index c68bdc96..2c94fc44 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -132,7 +132,6 @@ typedef enum { VIR_STORAGE_NET_PROTOCOL_HTTPS, VIR_STORAGE_NET_PROTOCOL_FTP, VIR_STORAGE_NET_PROTOCOL_FTPS, - VIR_STORAGE_NET_PROTOCOL_TFTP, VIR_STORAGE_NET_PROTOCOL_SSH, VIR_STORAGE_NET_PROTOCOL_VXHS, =20 --=20 2.25.0 From nobody Fri Apr 19 11:41:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1590041343; cv=none; d=zohomail.com; s=zohoarc; b=jGfHiOk8Rn5vJ0SxANhvV2hLw+YmZ2xjcaQQEgPfU15w1BNtoVojf7Vsoun5lsCzjxuqFMU8sTkwUtSmsWFMIr5a+Jy8WtKmamdj5GJ+oSE8fzsmBGJtFBaJGGXYZumFrzmV0EOGIO022D0UltN+jt1LxaoWU9J312XEzpK00HY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590041343; h=Content-Type:Content-Transfer-Encoding:Cc: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=9vTOVeBH6FdidfDhEt1cFCu11en7DEPVgZyB3wUYpzM=; b=dgquQVwUhoXirq98HQEK0ND+F50W0SYrFHeG6YVQn1sqrVKq9u1UI528t1D1mHvJBKL7y8wIhoTPhV4mdYkDDL2YePOiie6kZGxJ6BU2LkaYJNgrgwA3RayYY+akd8DozvNxynRD2QXCp0nXUtWQD2iIebUjYuJRxN5Ib9lc+t0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1590041343877386.6809322220495; Wed, 20 May 2020 23:09:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-M3VTQ404PzedCaJwW_ewCQ-1; Thu, 21 May 2020 02:08:59 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 702611800D42; Thu, 21 May 2020 06:08:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51C615C1D3; Thu, 21 May 2020 06:08:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1D7641809543; Thu, 21 May 2020 06:08:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04L68cwG001419 for ; Thu, 21 May 2020 02:08:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84CF35D9CD; Thu, 21 May 2020 06:08:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-200.pek2.redhat.com [10.72.13.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 123015D9C9; Thu, 21 May 2020 06:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590041342; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=9vTOVeBH6FdidfDhEt1cFCu11en7DEPVgZyB3wUYpzM=; b=e3icZEkAh++4ZnQSRL9tHV7Wd3jreKj1QjTojnEojqf69VSxaL9ZPGzMEHAIXJQlwgYzZJ Hp6xiUTMMX24Rfj++VH/64nOAj9bAQmMrE/+8iFwy6ZjobSsrsNXKrBA1p/njGjQOpoYZb xwdsBazZb/icy2eM3fmu7mzEA3l8do8= X-MC-Unique: M3VTQ404PzedCaJwW_ewCQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH 3/3] news: Remove support for tftp storage protocol Date: Thu, 21 May 2020 14:08:20 +0800 Message-Id: <20200521060820.156471-4-hhan@redhat.com> In-Reply-To: <20200521060820.156471-1-hhan@redhat.com> References: <20200521060820.156471-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Han Han --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 4cef804a..90743a39 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -49,6 +49,17 @@

+
+ + + Removed support for tftp storage protocol + + + The tftp protocol is not support in libxl driver. For QEMU, the = tftp + was dropped at v2.8 and actually unusable before v2.8. + + +
--=20 2.25.0