From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web11.2110.1587718548574762117 for ; Fri, 24 Apr 2020 01:55:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iIBdtqdx; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587718547; 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=59zGv9wKqtD/ug1Tic9PetEHLJEyfJj89WJCu8odAE8=; b=iIBdtqdxXcfR6yojWVKionKhBsnVYy3wr8VkJZpdql8H18wcyYY/VxuGk8+WFV9gJgtsel BGQLk1x4Z3dlF23Oaq5U773F87EzRL+2p5s7DjxlrWeOaMCf+Rozoc11qEnyrMreYSxWgi 1Px+8mI8Naf9Lb2HDnwILdjg7DFFc9Q= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-oOsHdMjcPbedMbc1TnPMfw-1; Fri, 24 Apr 2020 04:55:46 -0400 X-MC-Unique: oOsHdMjcPbedMbc1TnPMfw-1 Received: by mail-wr1-f72.google.com with SMTP id e5so4413170wrs.23 for ; Fri, 24 Apr 2020 01:55:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ikS1iIo1VIRFGnL2q8z/OWu7OmmmIGWURYckCzef/9A=; b=E5XM48WCB1OjR3mmwohtp51mLaSvVB6fsb8UqMJyrNfQTvcExhVvtGbtrFILS5+XGx /zrpAekxr2vDOWRy+ED2vHlYPdw9NOinDUnIkBpmovCizl4ruCdKSFSYEjAErEfi4V/w ww3FvGqPbj4+0hIiJRhurlnrR9pQ4CZ2cDi90y/4TiTtD6vcHvPeUqEj3lrLPNo59Et8 vtQb2XhNd9q++PFttFbp4lA+2NAHGgpVyytLXrr8cBxe+FN3L6iA0LndVPtQqzkWVLi0 TC50C50F4hRx+QvNAi7bS44mTLC9lBl2s73Dv7i7B8Lod54WKyaD2TYfOfsrpRjIO4fX Hx7A== X-Gm-Message-State: AGi0Pua5ic0FXLloew5StaXaCe8V3CftdncSrCMZH6AuoBGvcDw6N7rc EJ4KWAx7/IhRxwKZzZbjADpQYoTGW5qR90aJQ5kr55pV+We/ND69Z8B6ykURq8A5MP9JBiifaDz VZ/QxnduolcOsXQ== X-Received: by 2002:adf:fe45:: with SMTP id m5mr10539412wrs.124.1587718544860; Fri, 24 Apr 2020 01:55:44 -0700 (PDT) X-Google-Smtp-Source: APiQypJQtsdJqztPw9kxFQKFj4Cz2wf8CPY+kxrAsfqS3zFk7zZSkFAuokQYAGqOrPa5lKpjdYa+7A== X-Received: by 2002:adf:fe45:: with SMTP id m5mr10539390wrs.124.1587718544662; Fri, 24 Apr 2020 01:55:44 -0700 (PDT) Return-Path: Received: from [192.168.1.39] (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w12sm7574475wrk.56.2020.04.24.01.55.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Apr 2020 01:55:44 -0700 (PDT) Subject: Re: [PATCH 3/7] OvmfPkg/PlatformPei: use QemuFwCfgParseBool in UPDATE_BOOLEAN_PCD_FROM_... To: Laszlo Ersek , edk2-devel-groups-io Cc: Ard Biesheuvel , Jordan Justen , Per Sundstrom References: <20200424075353.8489-1-lersek@redhat.com> <20200424075353.8489-4-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <07023f7c-3862-7e89-8739-68ce8731a8a9@redhat.com> Date: Fri, 24 Apr 2020 10:55:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200424075353.8489-4-lersek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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 latter > with QemuFwCfgParseBool() from QemuFwCfgSimpleParserLib. >=20 > This change is compatible with valid strings accepted previously. >=20 > 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 > --- > OvmfPkg/PlatformPei/Platform.c | 47 +------------------- > 1 file changed, 2 insertions(+), 45 deletions(-) >=20 > diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platfor= m.c > index 088e616a980c..3b850c2c2626 100644 > --- a/OvmfPkg/PlatformPei/Platform.c > +++ b/OvmfPkg/PlatformPei/Platform.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -254,56 +255,12 @@ MemMapInitialization ( > ASSERT_RETURN_ERROR (PcdStatus); > } > =20 > -EFI_STATUS > -GetNamedFwCfgBoolean ( > - IN CHAR8 *FwCfgFileName, > - OUT BOOLEAN *Setting > - ) > -{ > - EFI_STATUS Status; > - FIRMWARE_CONFIG_ITEM FwCfgItem; > - UINTN FwCfgSize; > - UINT8 Value[3]; > - > - Status =3D QemuFwCfgFindFile (FwCfgFileName, &FwCfgItem, &FwCfgSize); > - if (EFI_ERROR (Status)) { > - return Status; > - } > - if (FwCfgSize > sizeof Value) { > - return EFI_BAD_BUFFER_SIZE; > - } > - QemuFwCfgSelectItem (FwCfgItem); > - QemuFwCfgReadBytes (FwCfgSize, Value); Until here QemuFwCfgGetAsString(), OK. > - > - if ((FwCfgSize =3D=3D 1) || > - (FwCfgSize =3D=3D 2 && Value[1] =3D=3D '\n') || > - (FwCfgSize =3D=3D 3 && Value[1] =3D=3D '\r' && Value[2] =3D=3D '\n= ')) { StripNewline(), OK. > - switch (Value[0]) { > - case '0': > - case 'n': > - case 'N': > - *Setting =3D FALSE; mFalseString[], OK. (And we get disable[d] + false). > - return EFI_SUCCESS; > - > - case '1': > - case 'y': > - case 'Y': > - *Setting =3D TRUE; mTrueString[], OK. (And we get enable[d] + true). > - return EFI_SUCCESS; > - > - default: > - break; > - } > - } > - return EFI_PROTOCOL_ERROR; > -} > - > #define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \ > do { \ > BOOLEAN Setting; \ > RETURN_STATUS PcdStatus; \ > \ > - if (!EFI_ERROR (GetNamedFwCfgBoolean ( \ > + if (!RETURN_ERROR (QemuFwCfgParseBool ( \ :) Reviewed-by: Philippe Mathieu-Daude > "opt/ovmf/" #TokenName, &Setting))) { \ > PcdStatus =3D PcdSetBoolS (TokenName, Setting); \ > ASSERT_RETURN_ERROR (PcdStatus); \ >=20