From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web11.5556.1588074068690506518 for ; Tue, 28 Apr 2020 04:41:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hdXKNsgu; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588074067; 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=htyJ/dlkdSFkTELqU9wsw44awxnQ/e374VCKHu/tT1o=; b=hdXKNsguyZklgAXbITcR1GqaaggYWxjhtf+LUC76kpykNYZEIGWt9U5d9YlecUzOjc8HZo L5gWBBA4ujsh/zVFt2W20slGaaw43j/QYWWKzfMTr4XezjlJzMECRdXz+u+NpwfslGVMac Y3EJvqd0XoJeM54qBYBW4xvPDsfVmC0= 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-375-iCZpKrVlNcOlav6lWeR2WQ-1; Tue, 28 Apr 2020 07:41:02 -0400 X-MC-Unique: iCZpKrVlNcOlav6lWeR2WQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8DE6464; Tue, 28 Apr 2020 11:41:00 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-33.ams2.redhat.com [10.36.113.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4266360300; Tue, 28 Apr 2020 11:40:59 +0000 (UTC) Subject: Re: [PATCH 3/7] OvmfPkg/PlatformPei: use QemuFwCfgParseBool in UPDATE_BOOLEAN_PCD_FROM_... To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , edk2-devel-groups-io Cc: Ard Biesheuvel , Jordan Justen , Per Sundstrom References: <20200424075353.8489-1-lersek@redhat.com> <20200424075353.8489-4-lersek@redhat.com> <07023f7c-3862-7e89-8739-68ce8731a8a9@redhat.com> From: "Laszlo Ersek" Message-ID: <2c575cbd-c645-7491-cfd4-79e21347894a@redhat.com> Date: Tue, 28 Apr 2020 13:40:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <07023f7c-3862-7e89-8739-68ce8731a8a9@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 04/24/20 10:55, Philippe Mathieu-Daud=C3=A9 wrote: > On 4/24/20 9:53 AM, Laszlo Ersek wrote: >> The UPDATE_BOOLEAN_PCD_FROM_FW_CFG() macro currently calls the >> module-private helper function GetNamedFwCfgBoolean(). Replace the latte= r >> with QemuFwCfgParseBool() from QemuFwCfgSimpleParserLib. >> >> This change is compatible with valid strings accepted previously. >> >> Cc: Ard Biesheuvel >> Cc: Jordan Justen >> Cc: Per Sundstrom >> Cc: Philippe Mathieu-Daud=C3=A9 >> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2681 >> Signed-off-by: Laszlo Ersek >> --- >> =C2=A0 OvmfPkg/PlatformPei/Platform.c | 47 +------------------- >> =C2=A0 1 file changed, 2 insertions(+), 45 deletions(-) >> >> diff --git a/OvmfPkg/PlatformPei/Platform.c >> b/OvmfPkg/PlatformPei/Platform.c >> index 088e616a980c..3b850c2c2626 100644 >> --- a/OvmfPkg/PlatformPei/Platform.c >> +++ b/OvmfPkg/PlatformPei/Platform.c >> @@ -27,6 +27,7 @@ >> =C2=A0 #include >> =C2=A0 #include >> =C2=A0 #include >> +#include >> =C2=A0 #include >> =C2=A0 #include >> =C2=A0 #include >> @@ -254,56 +255,12 @@ MemMapInitialization ( >> =C2=A0=C2=A0=C2=A0 ASSERT_RETURN_ERROR (PcdStatus); >> =C2=A0 } >> =C2=A0 -EFI_STATUS >> -GetNamedFwCfgBoolean ( >> -=C2=A0 IN=C2=A0 CHAR8=C2=A0=C2=A0 *FwCfgFileName, >> -=C2=A0 OUT BOOLEAN *Setting >> -=C2=A0 ) >> -{ >> -=C2=A0 EFI_STATUS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 Status; >> -=C2=A0 FIRMWARE_CONFIG_ITEM FwCfgItem; >> -=C2=A0 UINTN=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 FwCfgSize; >> -=C2=A0 UINT8=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Value[3]; >> - >> -=C2=A0 Status =3D QemuFwCfgFindFile (FwCfgFileName, &FwCfgItem, &FwCfgS= ize); >> -=C2=A0 if (EFI_ERROR (Status)) { >> -=C2=A0=C2=A0=C2=A0 return Status; >> -=C2=A0 } >> -=C2=A0 if (FwCfgSize > sizeof Value) { >> -=C2=A0=C2=A0=C2=A0 return EFI_BAD_BUFFER_SIZE; >> -=C2=A0 } >> -=C2=A0 QemuFwCfgSelectItem (FwCfgItem); >> -=C2=A0 QemuFwCfgReadBytes (FwCfgSize, Value); >=20 > Until here QemuFwCfgGetAsString(), OK. >=20 >> - >> -=C2=A0 if ((FwCfgSize =3D=3D 1) || >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (FwCfgSize =3D=3D 2 && Value[1] =3D=3D '= \n') || >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (FwCfgSize =3D=3D 3 && Value[1] =3D=3D '= \r' && Value[2] =3D=3D '\n')) { >=20 > StripNewline(), OK. >=20 >> -=C2=A0=C2=A0=C2=A0 switch (Value[0]) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case '0': >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case 'n': >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case 'N': >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *Setting =3D FALSE; >=20 > mFalseString[], OK. >=20 > (And we get disable[d] + false). >=20 >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return EFI_SUCCESS; >> - >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case '1': >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case 'y': >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case 'Y': >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *Setting =3D TRUE; >=20 > mTrueString[], OK. >=20 > (And we get enable[d] + true). >=20 >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return EFI_SUCCESS; >> - >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 default: >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; >> -=C2=A0=C2=A0=C2=A0 } >> -=C2=A0 } >> -=C2=A0 return EFI_PROTOCOL_ERROR; >> -} >> - >> =C2=A0 #define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName)=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 do {= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 BOOLEAN=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Setting;=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 RETURN_STATUS PcdStatus;=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (= !EFI_ERROR (GetNamedFwCfgBoolean (=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (= !RETURN_ERROR (QemuFwCfgParseBool (=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >=20 > :) >=20 > Reviewed-by: Philippe Mathieu-Daude Thanks for the careful review! :) Laszlo >=20 >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "opt/ovmf/" #TokenName, &Setting)))= { \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 PcdStatus =3D PcdSetBoolS (TokenName, Setting);=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 ASSERT_RETURN_ERROR (PcdStatus);=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >> >=20