From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124])
 by mx.groups.io with SMTP id smtpd.web11.38676.1660802413564984379
 for <devel@edk2.groups.io>;
 Wed, 17 Aug 2022 23:00:14 -0700
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z2VNUJBg;
 spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: lersek@redhat.com)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1660802412;
	h=from:from: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;
	bh=zIJ/E5hsNenpU97Pb6UJ5nWwHAPeygsw8OPjjzPm3T4=;
	b=Z2VNUJBgdBF3emXgX4QtU41/FEl2MHxXXfGMaMKIE1vqax0NLtcqE0BnmQ+Cnw80x1NHNf
	m+BBdz0YK/g4w5r13FnA83q2i/7GWyxv72pOm2YAoiZeflhCFthZoSPlgjQg14obO8MR4x
	wNlB33+UjVG86ZJ0RAa07yKRFzNDvkM=
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-526-ctFixqOLOBGk9iLlqVAXow-1; Thu, 18 Aug 2022 02:00:09 -0400
X-MC-Unique: ctFixqOLOBGk9iLlqVAXow-1
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D8E463806703;
	Thu, 18 Aug 2022 06:00:08 +0000 (UTC)
Received: from lacos-laptop-7.usersys.redhat.com (unknown [10.39.192.125])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 863E8492C3B;
	Thu, 18 Aug 2022 06:00:07 +0000 (UTC)
Subject: Re: [PATCH v2 2/2] OvmfPkg/OvmfPkgX64: Allow runtime control of IPv4 and IPv6 support
To: Ard Biesheuvel <ardb@kernel.org>, devel@edk2.groups.io
Cc: Yuan Yu <yuanyu@google.com>, Gerd Hoffmann <kraxel@redhat.com>,
 Pawel Polawski <ppolawsk@redhat.com>, Oliver Steffen <osteffen@redhat.com>,
 Jiewen Yao <jiewen.yao@intel.com>, "Brian J . Johnson"
 <brian.johnson@hpe.com>
References: <20220817151157.1941409-1-ardb@kernel.org>
 <20220817151157.1941409-3-ardb@kernel.org>
From: "Laszlo Ersek" <lersek@redhat.com>
Message-ID: <606fa379-1740-5353-d156-13069a5ba040@redhat.com>
Date: Thu, 18 Aug 2022 08:00:06 +0200
MIME-Version: 1.0
In-Reply-To: <20220817151157.1941409-3-ardb@kernel.org>
X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit

On 08/17/22 17:11, Ard Biesheuvel wrote:
> Wire up the newly added UefiDriverEntrypoint in a way that ties dispatch
> of the Ip4Dxe and Ip6Dxe drivers to QEMU fw_cfg variables
> 'opt/org.tianocore/IPv4Support' and 'opt/org.tianocore/IPv6Support'
> respectively.
> 
> Setting both variables to 'n' disables IP based networking entirely,
> without the need for additional code changes at the NIC driver or
> network boot protocol level.
> 
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>  OvmfPkg/OvmfPkgX64.dsc | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index 6e68f60dc90f..2cbe35c95824 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -947,6 +947,20 @@ [Components]
>        NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf
>    }
>  
> +  NetworkPkg/Ip4Dxe/Ip4Dxe.inf {
> +    <LibraryClasses>
> +      UefiDriverEntryPoint|OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf
> +    <PcdsFixedAtBuild>
> +      gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/IPv4Support"
> +  }
> +
> +  NetworkPkg/Ip6Dxe/Ip6Dxe.inf {
> +    <LibraryClasses>
> +      UefiDriverEntryPoint|OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf
> +    <PcdsFixedAtBuild>
> +      gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/IPv6Support"
> +  }
> +
>  !if $(NETWORK_TLS_ENABLE) == TRUE
>    NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {
>      <LibraryClasses>
> 

Looks good to me, but should be reflected to the other DSC files, and
perhaps (see Gerd's comments) factored out to some common include snippet.

Laszlo