From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::142; helo=mail-it1-x142.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it1-x142.google.com (mail-it1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BB4DB21B02822 for ; Tue, 6 Nov 2018 03:26:56 -0800 (PST) Received: by mail-it1-x142.google.com with SMTP id w7-v6so17135418itd.1 for ; Tue, 06 Nov 2018 03:26:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=ZAH6+Jw3ABx2c0ef5dnTzQesimG0v7c7iBQXrToil8w=; b=P7VsRDp/X6ZfE5YyASfPzXdWqdr9gX4GEefjJKP5nAOxgvO7piPKrhxLDg7ujQo4MF 7629aRwsekqn4mAN4/5O8ccVJFuSf83Ss0B0WdYWgL4hh9LGwJlFN8QTSVfJ1hZyDrdV AjeMzDOnXbG2FZYqtgViBp0gQh4pn01h5GvmM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=ZAH6+Jw3ABx2c0ef5dnTzQesimG0v7c7iBQXrToil8w=; b=pnEYJ3yV2vkga4iXAiuYFXRVAoF5lRLT9JlzRsnpWHBOBdeiZ/skWJnOyq05jhICJJ 43ULzZiEcKWOmxen+DplY7iA+vXz5vhhfWlHDjTLCd4BpHXVOTHKQnZtbNTdW5OqjEKw 7sqQGFQzv39eHqaDZOkyxfa4LLokpqbZCox3+nAH+kuSPw/E53O+QONlUCClu8/VBPl7 Zf0Q+cYiGavZBiBdjlq4xbfsvqv3/5gFHb9BGodrjiwtVwP5e4v5+X1VsVQVt5rtscNX R7hF0FIsdunulYTmREIbmjRkIlAzs8TO90r6Y+Y+m/gMxiTdkWURobqB77x52lAPeWHF HzOQ== X-Gm-Message-State: AGRZ1gIVxvlf6fh/YX0R2pI/qYW7BL8efXlYNMlnjzzzccd2Jp2OxDi+ GT893WQlfil3rsGQTj0lsEaXexEvHNQ6tJG9iOwtDw== X-Google-Smtp-Source: AJdET5eY6K/TCmVdTzt+Z5CRYc3JZ8k5CQKUEve1ug914S179NdBlpjtBt0C4fzrRwoN1yQCWf7Svjmetatu8SAUzQE= X-Received: by 2002:a02:9f85:: with SMTP id a5-v6mr23906824jam.2.1541503615691; Tue, 06 Nov 2018 03:26:55 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a6b:4f16:0:0:0:0:0 with HTTP; Tue, 6 Nov 2018 03:26:55 -0800 (PST) In-Reply-To: <90f82933-1468-c402-b71b-549d49cdb263@redhat.com> References: <20181105104918.82104-1-siyuan.fu@intel.com> <20181105104918.82104-4-siyuan.fu@intel.com> <90f82933-1468-c402-b71b-549d49cdb263@redhat.com> From: Ard Biesheuvel Date: Tue, 6 Nov 2018 12:26:55 +0100 Message-ID: To: Laszlo Ersek Cc: Fu Siyuan , "edk2-devel@lists.01.org" , Anthony Perard , Jordan Justen Subject: Re: [PATCH v2 3/3] OvmfPkg: Replace obsoleted network drivers from platform DSC/FDF. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Nov 2018 11:26:57 -0000 Content-Type: text/plain; charset="UTF-8" On 5 November 2018 at 23:46, Laszlo Ersek wrote: > On 11/05/18 11:49, Fu Siyuan wrote: >> V2: >> Add missed library instance for NetworkPkg iSCSI driver. >> >> This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those >> ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively >> maintained and will be removed from edk2 master soon. >> >> Cc: Jordan Justen >> Cc: Laszlo Ersek >> Cc: Ard Biesheuvel >> Cc: Anthony Perard >> Cc: Julien Grall >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Fu Siyuan >> --- >> OvmfPkg/OvmfPkgIa32.dsc | 14 ++++---------- >> OvmfPkg/OvmfPkgIa32.fdf | 10 +++------- >> OvmfPkg/OvmfPkgIa32X64.dsc | 14 ++++---------- >> OvmfPkg/OvmfPkgIa32X64.fdf | 10 +++------- >> OvmfPkg/OvmfPkgX64.dsc | 14 ++++---------- >> OvmfPkg/OvmfPkgX64.fdf | 10 +++------- >> 6 files changed, 21 insertions(+), 51 deletions(-) >> >> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc >> index 9f07e75050c0..7160e88eaee4 100644 >> --- a/OvmfPkg/OvmfPkgIa32.dsc >> +++ b/OvmfPkg/OvmfPkgIa32.dsc >> @@ -189,9 +189,7 @@ [LibraryClasses] >> !endif >> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >> >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf >> -!endif >> >> !if $(HTTP_BOOT_ENABLE) == TRUE >> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf >> @@ -790,18 +788,14 @@ [Components] >> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> NetworkPkg/TcpDxe/TcpDxe.inf >> + NetworkPkg/IScsiDxe/IScsiDxe.inf >> +!if $(NETWORK_IP6_ENABLE) == TRUE >> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf >> index 52b8b1fea1fc..1bc2e73bde16 100644 >> --- a/OvmfPkg/OvmfPkgIa32.fdf >> +++ b/OvmfPkg/OvmfPkgIa32.fdf >> @@ -309,18 +309,14 @@ [FV.DXEFV] >> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> + INF NetworkPkg/TcpDxe/TcpDxe.inf >> + INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> !if $(NETWORK_IP6_ENABLE) == TRUE >> INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> - INF NetworkPkg/TcpDxe/TcpDxe.inf >> INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> INF NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc >> index a4eaeb808c6b..e83e7ffab5b5 100644 >> --- a/OvmfPkg/OvmfPkgIa32X64.dsc >> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc >> @@ -194,9 +194,7 @@ [LibraryClasses] >> !endif >> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >> >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf >> -!endif >> >> !if $(HTTP_BOOT_ENABLE) == TRUE >> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf >> @@ -799,18 +797,14 @@ [Components.X64] >> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> NetworkPkg/TcpDxe/TcpDxe.inf >> + NetworkPkg/IScsiDxe/IScsiDxe.inf >> +!if $(NETWORK_IP6_ENABLE) == TRUE >> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf >> index 70845d6972fd..f36c7e741c8e 100644 >> --- a/OvmfPkg/OvmfPkgIa32X64.fdf >> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf >> @@ -315,18 +315,14 @@ [FV.DXEFV] >> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> + INF NetworkPkg/TcpDxe/TcpDxe.inf >> + INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> !if $(NETWORK_IP6_ENABLE) == TRUE >> INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> - INF NetworkPkg/TcpDxe/TcpDxe.inf >> INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> INF NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc >> index aa3efc5e73b9..c0f86d4ad303 100644 >> --- a/OvmfPkg/OvmfPkgX64.dsc >> +++ b/OvmfPkg/OvmfPkgX64.dsc >> @@ -194,9 +194,7 @@ [LibraryClasses] >> !endif >> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >> >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf >> -!endif >> >> !if $(HTTP_BOOT_ENABLE) == TRUE >> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf >> @@ -797,18 +795,14 @@ [Components] >> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> NetworkPkg/TcpDxe/TcpDxe.inf >> + NetworkPkg/IScsiDxe/IScsiDxe.inf >> +!if $(NETWORK_IP6_ENABLE) == TRUE >> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf >> index 1eb46ac9a2d8..96a114a20bdc 100644 >> --- a/OvmfPkg/OvmfPkgX64.fdf >> +++ b/OvmfPkg/OvmfPkgX64.fdf >> @@ -315,18 +315,14 @@ [FV.DXEFV] >> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> + INF NetworkPkg/TcpDxe/TcpDxe.inf >> + INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> !if $(NETWORK_IP6_ENABLE) == TRUE >> INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> - INF NetworkPkg/TcpDxe/TcpDxe.inf >> INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> INF NetworkPkg/DnsDxe/DnsDxe.inf >> > > Assuming we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf" an integral part > of the edk2 networking stack, without which (and its OpenSSL dependency) > noone would ever want to build OVMF, this patch is OK. > > I don't know what other OVMF users think about this; personally I'm ok > with it. > > Reviewed-by: Laszlo Ersek > I think that is fine. Reviewed-by: Ard Biesheuvel Since the delta between NETWORK_IP6_ENABLE on vs off is decreasing, any chance we could drop it altogether at some point?