From nobody Tue May 7 10:08:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68065+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68065+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1606714488; cv=none; d=zohomail.com; s=zohoarc; b=BuyBkOVQpepU1bStaHq9riq7w5o9v3DoRwj7ECmXF+Nc8R14g/xLh6DM/zhw5px+XEgi+4sIEYM1HxVHfAB/zutxuXOIGbDKziA5d6Yfv5Qz1v9W++inACcUcv3wEg5QV6/A/1iiFrLA2j1lb1SBSZuojtvDWHI9Go6PGnnPWIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606714488; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=aoYKc7AQjfVYgbPyGXjuJGPTOHd0L2AClaRWcVL1m/I=; b=ANXftSXKpsxDVO83kVv9XSeTxbS93dNHBCoxOp+EHq65C0bUmaIt+iU6TzofYPSxEfarET5UhELwzMKOTJXfRybGpuqEpMTkX9Uz5T6dQ8hfm8w+t/3Ffj+sxBvE3klsv3Oo2F4xII2HfOU9J+uSGe1E2YO3ihExNNwHpJUni4A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68065+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606714488613289.8214237327413; Sun, 29 Nov 2020 21:34:48 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id hmFQYY1788612x3FMu135csN; Sun, 29 Nov 2020 21:34:48 -0800 X-Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by mx.groups.io with SMTP id smtpd.web08.56059.1606714482769498506 for ; Sun, 29 Nov 2020 21:34:42 -0800 X-Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbph-000CQg-Rb; Sun, 29 Nov 2020 22:34:41 -0700 X-Received: from mta5.zcs.xmission.com ([166.70.13.69]) by in02.mta.xmission.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbpg-000oER-MF; Sun, 29 Nov 2020 22:34:41 -0700 X-Received: from localhost (localhost [127.0.0.1]) by mta5.zcs.xmission.com (Postfix) with ESMTP id 8B50912807A7; Sun, 29 Nov 2020 22:34:40 -0700 (MST) X-Amavis-Modified: Mail body modified (using disclaimer) - mta5.zcs.xmission.com X-Received: from mta5.zcs.xmission.com ([127.0.0.1]) by localhost (mta5.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id TlbVS1JwsT8x; Sun, 29 Nov 2020 22:34:40 -0700 (MST) X-Received: from localhost.localdomain (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta5.zcs.xmission.com (Postfix) with ESMTPSA id 48E1512804B6; Sun, 29 Nov 2020 22:34:40 -0700 (MST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Peter Grehan Date: Sun, 29 Nov 2020 22:34:08 -0700 Message-Id: <20201130053412.2-2-rebecca@bsdio.com> In-Reply-To: <20201130053412.2-1-rebecca@bsdio.com> References: <20201130053412.2-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1kjbpg-000oER-MF;;;mid=<20201130053412.2-2-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.69;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.69 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa05.xmission.com X-Spam-Level: X-Spam-Status: No, score=0.5 required=8.0 tests=ALL_TRUSTED,BAYES_40, DCC_CHECK_NEGATIVE,XMNoVowels autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * -0.0 BAYES_40 BODY: Bayes spam probability is 20 to 40% * [score: 0.3109] * 1.5 XMNoVowels Alpha-numberic number with no vowels * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa05 1397; IP=ok Body=1 Fuz1=1] [Fuz2=1] X-Spam-DCC: XMission; sa05 1397; IP=ok Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 534 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 13 (2.4%), b_tie_ro: 11 (2.1%), parse: 2.2 (0.4%), extract_message_metadata: 22 (4.1%), get_uri_detail_list: 4.1 (0.8%), tests_pri_-1000: 20 (3.8%), tests_pri_-950: 1.68 (0.3%), tests_pri_-900: 1.30 (0.2%), tests_pri_-90: 88 (16.5%), check_bayes: 85 (16.0%), b_tokenize: 16 (2.9%), b_tok_get_all: 9 (1.7%), b_comp_prob: 3.0 (0.6%), b_tok_touch_all: 53 (10.0%), b_finish: 1.13 (0.2%), tests_pri_0: 365 (68.4%), check_dkim_signature: 0.82 (0.2%), check_dkim_adsp: 35 (6.6%), poll_dns_idle: 33 (6.2%), tests_pri_10: 4.3 (0.8%), tests_pri_500: 12 (2.3%), rewrite_mail: 0.00 (0.0%) Subject: [edk2-devel] [PATCH 1/5] OvmfPkg: Fix BhyveFwCtlLib build with VS2019 X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: XMkaKF9j1jOaXA1lcRwJIqRix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606714488; bh=+ZCWdYq4N7L4nHhZL9i43hnWpdjr1CPW9HQuXNTbKLE=; h=Cc:Date:From:Reply-To:Subject:To; b=rVGbDx9X3pLfLzD5Z1pFYUFyiSP05264jUWBtqLYRlQOZ8cChfayYj4tuKtoeQ94Fkk pYD9MFWO774clyFkHzGNlKeUIu84mMBQ7x5d4YUrL5KWTKmpmoPG1nzMngwTWQ8u84SoK Pz4sS8cjc0t5409LzR6OMNlprbHdggxAVM8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Update BhyveFwCtlLib.c to fix problems with UINT32/UINTN types that prevented Bhyve from building with VS2019. Signed-off-by: Rebecca Cran Acked-by: Laszlo Ersek --- OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c b/OvmfPkg/Librar= y/BhyveFwCtlLib/BhyveFwCtlLib.c index 2c45ad70ca71..8804e1df0b3f 100644 --- a/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c +++ b/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c @@ -40,12 +40,12 @@ STATIC CONST CHAR8 mBhyveSig[4] =3D { 'B', 'H', 'Y', 'V= ' }; =20 STATIC BOOLEAN mBhyveFwCtlSupported =3D FALSE; =20 -STATIC INTN mBhyveFwCtlTxid =3D 0xa5; +STATIC INT32 mBhyveFwCtlTxid =3D 0xa5; =20 /* XXX Maybe a better inbuilt version of this ? */ struct BIoVec { VOID *Base; - UINTN Len; + UINT32 Len; }; =20 struct MsgRxHdr { @@ -86,14 +86,14 @@ BhyveFwCtl_CvtErr ( } =20 STATIC -UINTN +UINT32 EFIAPI BIov_WLen ( IN struct BIoVec b[] ) { - UINTN i; - UINTN tLen; + UINT32 i; + UINT32 tLen; =20 tLen =3D 0; =20 @@ -106,14 +106,14 @@ BIov_WLen ( } =20 /** - Utility to send 1-3 bhyes of input as a 4-byte value + Utility to send 1-3 bytes of input as a 4-byte value with trailing zeroes. **/ STATIC UINT32 BIov_Send_Rem ( IN UINT32 *Data, - IN UINTN Len + IN UINT32 Len ) { union { @@ -121,7 +121,7 @@ BIov_Send_Rem ( UINT32 w; } u; UINT8 *cdata; - UINTN i; + UINT32 i; =20 cdata =3D (UINT8 *)Data; u.w =3D 0; @@ -140,7 +140,7 @@ STATIC VOID BIov_Send ( IN char *Data, - IN UINTN Len + IN UINT32 Len ) { UINT32 *LData; @@ -166,7 +166,7 @@ BIov_SendAll ( IN struct BIoVec b[] ) { - INTN i; + INT32 i; =20 if (b !=3D NULL) { for (i =3D 0; b[i].Base; i++) { @@ -182,13 +182,13 @@ STATIC VOID EFIAPI BhyveFwCtl_MsgSend( - IN UINTN OpCode, + IN UINT32 OpCode, IN struct BIoVec Data[] ) { struct BIoVec hIov[4]; UINT32 Hdr[3]; - UINTN i; + UINT32 i; =20 /* Set up header as an iovec */ for (i =3D 0; i < 3; i++) { @@ -200,7 +200,7 @@ BhyveFwCtl_MsgSend( =20 /* Initialize header */ Hdr[0] =3D BIov_WLen (hIov) + BIov_WLen (Data); - Hdr[1] =3D OpCode; + Hdr[1] =3D (UINT32)OpCode; Hdr[2] =3D mBhyveFwCtlTxid; =20 /* Send header and data */ @@ -222,8 +222,8 @@ BhyveFwCtl_MsgRecv( RETURN_STATUS Status; UINT32 *Dp; UINT32 Rd; - UINTN remLen; - INTN oLen, xLen; + UINT32 remLen; + INT32 oLen, xLen; =20 Rd =3D IoRead32 (FW_PORT); if (Rd < sizeof(struct MsgRxHdr)) { @@ -283,7 +283,7 @@ STATIC RETURN_STATUS EFIAPI BhyveFwCtl_Msg( - IN UINTN OpCode, + IN UINT32 OpCode, IN struct BIoVec Sdata[], OUT struct BIoVec Rdata[] ) @@ -306,18 +306,18 @@ RETURN_STATUS EFIAPI BhyveFwCtlGetLen ( IN CONST CHAR8 *Name, - IN OUT UINTN *Size + IN OUT UINT32 *Size ) { struct BIoVec Req[2], Resp[2]; RETURN_STATUS Status; =20 Req[0].Base =3D (VOID *)Name; - Req[0].Len =3D AsciiStrLen (Name) + 1; + Req[0].Len =3D (UINT32)AsciiStrLen (Name) + 1; Req[1].Base =3D NULL; =20 Resp[0].Base =3D Size; - Resp[0].Len =3D sizeof(UINTN); + Resp[0].Len =3D sizeof(UINT32); Resp[1].Base =3D NULL; =20 Status =3D BhyveFwCtl_Msg (OP_GET_LEN, Req, Resp); @@ -337,7 +337,7 @@ EFIAPI BhyveFwCtlGetVal ( IN CONST CHAR8 *Name, OUT VOID *Item, - IN OUT UINTN *Size + IN OUT UINT32 *Size ) { struct BIoVec Req[2], Resp[2]; @@ -348,7 +348,7 @@ BhyveFwCtlGetVal ( return RETURN_INVALID_PARAMETER; =20 Req[0].Base =3D (VOID *)Name; - Req[0].Len =3D AsciiStrLen(Name) + 1; + Req[0].Len =3D (UINT32)AsciiStrLen(Name) + 1; Req[1].Base =3D NULL; =20 Resp[0].Base =3D &FwGetvalBuf; @@ -363,7 +363,7 @@ BhyveFwCtlGetVal ( * multiple iovecs. */ if ((Status =3D=3D RETURN_SUCCESS) || (Status =3D=3D RETURN_BUFFER_TOO_S= MALL)) { - *Size =3D FwGetvalBuf.fSize; + *Size =3D (UINT32)FwGetvalBuf.fSize; CopyMem (Item, FwGetvalBuf.fData, *Size); } =20 @@ -387,9 +387,9 @@ BhyveFwCtlGet ( return RETURN_UNSUPPORTED; =20 if (Item =3D=3D NULL) { - Status =3D BhyveFwCtlGetLen (Name, Size); + Status =3D BhyveFwCtlGetLen (Name, (UINT32*)Size); } else { - Status =3D BhyveFwCtlGetVal (Name, Item, Size); + Status =3D BhyveFwCtlGetVal (Name, Item, (UINT32*)Size); } =20 return Status; @@ -406,7 +406,7 @@ BhyveFwCtlInitialize ( VOID ) { - UINTN i; + UINT32 i; UINT8 ch; =20 DEBUG ((DEBUG_INFO, "FwCtlInitialize\n")); --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68065): https://edk2.groups.io/g/devel/message/68065 Mute This Topic: https://groups.io/mt/78602183/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 10:08:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68067+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68067+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1606714484; cv=none; d=zohomail.com; s=zohoarc; b=HT2Cc7ZQBux8bvgePfLOw4H345qsI+XEfMvIU8Z9paF27oZe46acZDVdpC8UpZZAG4FJK6ruT6Avp3lgyEGAk1c+eFGXgDmafdv8QKfr0VnpvFd1kVwanB9SBtNhIbzvsU2M6dFg2ApIzr22DPk0pS12EGm5PJXTdsGaq+Ug9EE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606714484; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=3yXZLq2mGXtww4q2nSPqAssKUBbSxmtiDGi+LBX4FU0=; b=O/8Sl/MHOV0oeVqV7f6d09LuK0fKX40X/DdpJ/9oPVdeQY/waTsVMvnjtxgHAtDknGWKVi1g6qm7DKFygO23ZYkOO0OnUiogWtl7++xEDYEEQK0CAfPXfCHsSet25ldsA2CKqGNlUlsCjPjWQPcuwSBCkgSFEXkgF0wzC0fi904= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68067+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606714484504564.8829137091544; Sun, 29 Nov 2020 21:34:44 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id zoVCYY1788612xEfGwcDU2Ct; Sun, 29 Nov 2020 21:34:44 -0800 X-Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by mx.groups.io with SMTP id smtpd.web12.55969.1606714483209461852 for ; Sun, 29 Nov 2020 21:34:43 -0800 X-Received: from in02.mta.xmission.com ([166.70.13.52]) by out01.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbpi-003pfQ-Ea; Sun, 29 Nov 2020 22:34:42 -0700 X-Received: from mta5.zcs.xmission.com ([166.70.13.69]) by in02.mta.xmission.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbph-000oEX-1o; Sun, 29 Nov 2020 22:34:42 -0700 X-Received: from localhost (localhost [127.0.0.1]) by mta5.zcs.xmission.com (Postfix) with ESMTP id B8DDF12804B6; Sun, 29 Nov 2020 22:34:40 -0700 (MST) X-Amavis-Modified: Mail body modified (using disclaimer) - mta5.zcs.xmission.com X-Received: from mta5.zcs.xmission.com ([127.0.0.1]) by localhost (mta5.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id SqkIOIlywQpt; Sun, 29 Nov 2020 22:34:40 -0700 (MST) X-Received: from localhost.localdomain (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta5.zcs.xmission.com (Postfix) with ESMTPSA id 8397D12807A0; Sun, 29 Nov 2020 22:34:40 -0700 (MST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Peter Grehan Date: Sun, 29 Nov 2020 22:34:09 -0700 Message-Id: <20201130053412.2-3-rebecca@bsdio.com> In-Reply-To: <20201130053412.2-1-rebecca@bsdio.com> References: <20201130053412.2-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1kjbph-000oEX-1o;;;mid=<20201130053412.2-3-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.69;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.69 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa04.xmission.com X-Spam-Level: ** X-Spam-Status: No, score=2.0 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,T_TooManySym_01,XMNoVowels,XMSubLong autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4910] * 1.5 XMNoVowels Alpha-numberic number with no vowels * 0.7 XMSubLong Long Subject * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; IP=ok Body=1 Fuz1=1] [Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa04 1397; IP=ok Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: **;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 959 ms - load_scoreonly_sql: 0.06 (0.0%), signal_user_changed: 13 (1.4%), b_tie_ro: 11 (1.2%), parse: 2.4 (0.3%), extract_message_metadata: 23 (2.4%), get_uri_detail_list: 5 (0.6%), tests_pri_-1000: 21 (2.2%), tests_pri_-950: 1.72 (0.2%), tests_pri_-900: 1.29 (0.1%), tests_pri_-90: 185 (19.3%), check_bayes: 183 (19.1%), b_tokenize: 18 (1.9%), b_tok_get_all: 10 (1.1%), b_comp_prob: 3.0 (0.3%), b_tok_touch_all: 146 (15.2%), b_finish: 1.42 (0.1%), tests_pri_0: 696 (72.6%), check_dkim_signature: 1.05 (0.1%), check_dkim_adsp: 2.9 (0.3%), poll_dns_idle: 0.44 (0.0%), tests_pri_10: 2.2 (0.2%), tests_pri_500: 8 (0.8%), rewrite_mail: 0.00 (0.0%) Subject: [edk2-devel] [PATCH 2/5] OvmfPkg: Improve code style/formatting in BhyveFwCtlLib.c X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: ION7JOUNCMg1FriOEKhbXdsDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606714484; bh=0UZK/qEzgwhA8lttyGiTmziE4ZXFJeAtBSoEYsptJUM=; h=Cc:Date:From:Reply-To:Subject:To; b=ipY3Dpw4768/VYz8PBWm+LUOSZ9cEwoPj12Eo2iXLrz6bHXJbwti/QH0qXm2Up5UEpq jF7Xm12mT0f/YSzk93RHnPKmq6HZMp0drKDXl4tu5SKY+aquyzEBw/pdc4e032EdgSy1R hjx0EDLwr3fD0ZfXzZhx6rDgZXyItJ5cbRA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The code style in Library/BhyveFwCtlLib/BhyveFwCtlLib.c was very inconsistent. Fix it to pass the ECC tool checks by typedef'ing structs, and improve indentation. Signed-off-by: Rebecca Cran Acked-by: Laszlo Ersek --- OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c | 136 +++++++++--------- 1 file changed, 69 insertions(+), 67 deletions(-) diff --git a/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c b/OvmfPkg/Librar= y/BhyveFwCtlLib/BhyveFwCtlLib.c index 8804e1df0b3f..f1f7b2e0d240 100644 --- a/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c +++ b/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c @@ -12,27 +12,27 @@ #include "Uefi.h" #include #include +#include #include #include -#include #include #include =20 -#define FW_PORT 0x510 -#define FW_IPORT 0x511 +#define FW_PORT 0x510 +#define FW_IPORT 0x511 =20 /* Transport protocol basic operations */ -#define OP_NULL 1 -#define OP_ECHO 2 -#define OP_GET 3 -#define OP_GET_LEN 4 -#define OP_SET 5 +#define OP_NULL 1 +#define OP_ECHO 2 +#define OP_GET 3 +#define OP_GET_LEN 4 +#define OP_SET 5 =20 /* Transport protocol error returns */ -#define T_ESUCCESS 0 +#define T_ESUCCESS 0 #define T_ENOENT 2 -#define T_E2BIG 7 -#define T_EMSGSIZE 40 +#define T_E2BIG 7 +#define T_EMSGSIZE 40 =20 #define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y)) =20 @@ -43,24 +43,24 @@ STATIC BOOLEAN mBhyveFwCtlSupported =3D FALSE; STATIC INT32 mBhyveFwCtlTxid =3D 0xa5; =20 /* XXX Maybe a better inbuilt version of this ? */ -struct BIoVec { - VOID *Base; - UINT32 Len; -}; +typedef struct { + VOID *Base; + UINT32 Len; +} BIO_VEC; =20 -struct MsgRxHdr { +typedef struct { UINT32 Sz; UINT32 Op; UINT32 TxId; UINT32 Err; -}; +} MSG_RX_HDR; =20 STATIC RETURN_STATUS EFIAPI BhyveFwCtl_CvtErr ( - IN UINT32 errno - ) + IN UINT32 errno + ) { RETURN_STATUS Status; =20 @@ -89,8 +89,8 @@ STATIC UINT32 EFIAPI BIov_WLen ( - IN struct BIoVec b[] - ) + IN BIO_VEC b[] + ) { UINT32 i; UINT32 tLen; @@ -112,9 +112,9 @@ BIov_WLen ( STATIC UINT32 BIov_Send_Rem ( - IN UINT32 *Data, - IN UINT32 Len - ) + IN UINT32 *Data, + IN UINT32 Len + ) { union { UINT8 c[4]; @@ -140,7 +140,7 @@ STATIC VOID BIov_Send ( IN char *Data, - IN UINT32 Len + IN UINT32 Len ) { UINT32 *LData; @@ -163,7 +163,7 @@ BIov_Send ( STATIC VOID BIov_SendAll ( - IN struct BIoVec b[] + IN BIO_VEC b[] ) { INT32 i; @@ -182,13 +182,13 @@ STATIC VOID EFIAPI BhyveFwCtl_MsgSend( - IN UINT32 OpCode, - IN struct BIoVec Data[] - ) + IN UINT32 OpCode, + IN BIO_VEC Data[] + ) { - struct BIoVec hIov[4]; - UINT32 Hdr[3]; - UINT32 i; + BIO_VEC hIov[4]; + UINT32 Hdr[3]; + UINT32 i; =20 /* Set up header as an iovec */ for (i =3D 0; i < 3; i++) { @@ -215,18 +215,19 @@ STATIC RETURN_STATUS EFIAPI BhyveFwCtl_MsgRecv( - OUT struct MsgRxHdr *Rhdr, - OUT struct BIoVec Data[] - ) + OUT MSG_RX_HDR *Rhdr, + OUT BIO_VEC Data[] + ) { - RETURN_STATUS Status; + RETURN_STATUS Status; UINT32 *Dp; - UINT32 Rd; + UINT32 Rd; UINT32 remLen; - INT32 oLen, xLen; + INT32 oLen; + INT32 xLen; =20 Rd =3D IoRead32 (FW_PORT); - if (Rd < sizeof(struct MsgRxHdr)) { + if (Rd < sizeof (MSG_RX_HDR)) { ; } =20 @@ -237,9 +238,9 @@ BhyveFwCtl_MsgRecv( Rhdr->Err =3D IoRead32 (FW_PORT); =20 /* Convert transport errno into UEFI error status */ - Status =3D BhyveFwCtl_CvtErr(Rhdr->Err); + Status =3D BhyveFwCtl_CvtErr (Rhdr->Err); =20 - remLen =3D Rd - sizeof(struct MsgRxHdr); + remLen =3D Rd - sizeof (MSG_RX_HDR); xLen =3D 0; =20 /* @@ -258,7 +259,7 @@ BhyveFwCtl_MsgRecv( } while (remLen > 0) { *Dp++ =3D IoRead32 (FW_PORT); - remLen -=3D sizeof(UINT32); + remLen -=3D sizeof (UINT32); } Data[0].Len =3D oLen; } else { @@ -272,7 +273,7 @@ BhyveFwCtl_MsgRecv( /* Drop additional data */ while (xLen > 0) { (void) IoRead32 (FW_PORT); - xLen -=3D sizeof(UINT32); + xLen -=3D sizeof (UINT32); } =20 return Status; @@ -283,13 +284,13 @@ STATIC RETURN_STATUS EFIAPI BhyveFwCtl_Msg( - IN UINT32 OpCode, - IN struct BIoVec Sdata[], - OUT struct BIoVec Rdata[] + IN UINT32 OpCode, + IN BIO_VEC Sdata[], + OUT BIO_VEC Rdata[] ) { - struct MsgRxHdr Rh; - RETURN_STATUS Status; + MSG_RX_HDR Rh; + RETURN_STATUS Status; =20 Status =3D RETURN_SUCCESS; =20 @@ -305,19 +306,19 @@ STATIC RETURN_STATUS EFIAPI BhyveFwCtlGetLen ( - IN CONST CHAR8 *Name, - IN OUT UINT32 *Size + IN CONST CHAR8 *Name, + IN OUT UINT32 *Size ) { - struct BIoVec Req[2], Resp[2]; - RETURN_STATUS Status; + BIO_VEC Req[2], Resp[2]; + RETURN_STATUS Status; =20 Req[0].Base =3D (VOID *)Name; Req[0].Len =3D (UINT32)AsciiStrLen (Name) + 1; Req[1].Base =3D NULL; =20 Resp[0].Base =3D Size; - Resp[0].Len =3D sizeof(UINT32); + Resp[0].Len =3D sizeof (UINT32); Resp[1].Base =3D NULL; =20 Status =3D BhyveFwCtl_Msg (OP_GET_LEN, Req, Resp); @@ -335,24 +336,25 @@ STATIC RETURN_STATUS EFIAPI BhyveFwCtlGetVal ( - IN CONST CHAR8 *Name, - OUT VOID *Item, - IN OUT UINT32 *Size + IN CONST CHAR8 *Name, + OUT VOID *Item, + IN OUT UINT32 *Size ) { - struct BIoVec Req[2], Resp[2]; - RETURN_STATUS Status; + BIO_VEC Req[2]; + BIO_VEC Resp[2]; + RETURN_STATUS Status; =20 /* Make sure temp buffer is larger than passed-in size */ - if (*Size > sizeof(FwGetvalBuf.fData)) + if (*Size > sizeof (FwGetvalBuf.fData)) return RETURN_INVALID_PARAMETER; =20 Req[0].Base =3D (VOID *)Name; - Req[0].Len =3D (UINT32)AsciiStrLen(Name) + 1; + Req[0].Len =3D (UINT32)AsciiStrLen (Name) + 1; Req[1].Base =3D NULL; =20 Resp[0].Base =3D &FwGetvalBuf; - Resp[0].Len =3D sizeof(UINT64) + *Size; + Resp[0].Len =3D sizeof (UINT64) + *Size; Resp[1].Base =3D NULL; =20 Status =3D BhyveFwCtl_Msg (OP_GET, Req, Resp); @@ -376,9 +378,9 @@ BhyveFwCtlGetVal ( RETURN_STATUS EFIAPI BhyveFwCtlGet ( - IN CONST CHAR8 *Name, + IN CONST CHAR8 *Name, OUT VOID *Item, - IN OUT UINTN *Size + IN OUT UINTN *Size ) { RETURN_STATUS Status; @@ -403,11 +405,11 @@ BhyveFwCtlGet ( RETURN_STATUS EFIAPI BhyveFwCtlInitialize ( - VOID - ) + VOID + ) { - UINT32 i; - UINT8 ch; + UINT32 i; + UINT8 ch; =20 DEBUG ((DEBUG_INFO, "FwCtlInitialize\n")); =20 --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68067): https://edk2.groups.io/g/devel/message/68067 Mute This Topic: https://groups.io/mt/78602185/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 10:08:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68064+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68064+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1606714483; cv=none; d=zohomail.com; s=zohoarc; b=jTddhm1GPCNgbHyym1Hve8lN7OT1ahcC7MOgLPt9rsBEJk0sc0ItlVvIqGGdyi1wh1IDV50lwGGwfp7uFNDtpJNij4oZ5IT+QdczbEFoU7HJKpHUHl+8EMWQgOuyIHGI7CQKfYGXMfGkJG8MTCmGyEfh6GuOBfgWT2idjuUN084= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606714483; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=hc2Stdo5ASz/i6nOA7eYsuSSRVNq7qAoT/FyHgYp7Fw=; b=EYi78ryD86vDXCrFsjY+w/DskbjQ/7hIAlwYE4sYfEHrWBS5947TAz14UBw4g3ElvaMaoL4IoH9drcCwyo3bnoTeJ39l9hM34mDAEeXehLnxmcV+rKw9BkLMf/tP5y7wXxUSyCdY78J+gw4Ou5uFIpNpZOlMDk0PS3UJekDtvmg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68064+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 160671448325368.08306101888218; Sun, 29 Nov 2020 21:34:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id uvpGYY1788612x7PjWSyTuBk; Sun, 29 Nov 2020 21:34:42 -0800 X-Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by mx.groups.io with SMTP id smtpd.web09.56188.1606714482438225086 for ; Sun, 29 Nov 2020 21:34:42 -0800 X-Received: from in01.mta.xmission.com ([166.70.13.51]) by out01.mta.xmission.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1kjbph-003pfC-Lp; Sun, 29 Nov 2020 22:34:41 -0700 X-Received: from mta5.zcs.xmission.com ([166.70.13.69]) by in01.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1kjbph-0007Kj-53; Sun, 29 Nov 2020 22:34:41 -0700 X-Received: from localhost (localhost [127.0.0.1]) by mta5.zcs.xmission.com (Postfix) with ESMTP id 0CC3E12807A0; Sun, 29 Nov 2020 22:34:41 -0700 (MST) X-Amavis-Modified: Mail body modified (using disclaimer) - mta5.zcs.xmission.com X-Received: from mta5.zcs.xmission.com ([127.0.0.1]) by localhost (mta5.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id i3OEhmC6YapP; Sun, 29 Nov 2020 22:34:40 -0700 (MST) X-Received: from localhost.localdomain (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta5.zcs.xmission.com (Postfix) with ESMTPSA id B9CF3128077E; Sun, 29 Nov 2020 22:34:40 -0700 (MST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Peter Grehan Date: Sun, 29 Nov 2020 22:34:10 -0700 Message-Id: <20201130053412.2-4-rebecca@bsdio.com> In-Reply-To: <20201130053412.2-1-rebecca@bsdio.com> References: <20201130053412.2-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1kjbph-0007Kj-53;;;mid=<20201130053412.2-4-rebecca@bsdio.com>;;;hst=in01.mta.xmission.com;;;ip=166.70.13.69;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.69 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa03.xmission.com X-Spam-Level: * X-Spam-Status: No, score=1.3 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,T_TooManySym_01,XMNoVowels autolearn=disabled version=3.4.2 X-Spam-Virus: No X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4998] * 1.5 XMNoVowels Alpha-numberic number with no vowels * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa03 1397; IP=ok Body=1 Fuz1=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa03 1397; IP=ok Body=1 Fuz1=1 X-Spam-Combo: *;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 345 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 3.9 (1.1%), b_tie_ro: 2.6 (0.8%), parse: 0.70 (0.2%), extract_message_metadata: 9 (2.6%), get_uri_detail_list: 0.54 (0.2%), tests_pri_-1000: 12 (3.6%), tests_pri_-950: 0.99 (0.3%), tests_pri_-900: 0.78 (0.2%), tests_pri_-90: 191 (55.4%), check_bayes: 190 (55.1%), b_tokenize: 4.1 (1.2%), b_tok_get_all: 3.3 (1.0%), b_comp_prob: 1.06 (0.3%), b_tok_touch_all: 179 (51.9%), b_finish: 0.62 (0.2%), tests_pri_0: 117 (33.8%), check_dkim_signature: 0.39 (0.1%), check_dkim_adsp: 2.3 (0.7%), poll_dns_idle: 1.02 (0.3%), tests_pri_10: 1.82 (0.5%), tests_pri_500: 6 (1.6%), rewrite_mail: 0.00 (0.0%) Subject: [edk2-devel] [PATCH 3/5] OvmfPkg: Fix style of BhyveFwCtlLib.inf X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: KNfMdH7LfwvEHxn2P3WydI6Xx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606714482; bh=KGVhjSnUqSm8NX9g2ja4Fv/J81ML88tQeUR+mX7Y0rg=; h=Cc:Date:From:Reply-To:Subject:To; b=hmrZvvIE7fL7dqzHQejQMjSzBdCDZi43QKMp1cDAEEppUTM5eE+GWHg+uVvzkJRWkus 0o7cp4rtFcjKxg0BrVxttNNuHQzVwRIUY/+qOvWmgMq02HtRPME+q4mz8kiv+KmRm3ASR 61D8a+zCLsPcPUNLYutHWL/SpIcU/Il1ZhI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Fix the order of libraries and update INF_VERSION to 1.29. Signed-off-by: Rebecca Cran Acked-by: Laszlo Ersek --- OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.inf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.inf b/OvmfPkg/Libr= ary/BhyveFwCtlLib/BhyveFwCtlLib.inf index 4643de381e04..cf5e55d31334 100644 --- a/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.inf +++ b/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.inf @@ -9,7 +9,7 @@ ## =20 [Defines] - INF_VERSION =3D 0x00010005 + INF_VERSION =3D 1.29 BASE_NAME =3D BhyveFwCtlLib FILE_GUID =3D fd982666-67f9-11e5-a42a-0025908602f6 MODULE_TYPE =3D BASE @@ -35,7 +35,6 @@ [LibraryClasses] BaseLib BaseMemoryLib DebugLib + IntrinsicLib IoLib MemoryAllocationLib - IntrinsicLib - --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68064): https://edk2.groups.io/g/devel/message/68064 Mute This Topic: https://groups.io/mt/78602182/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 10:08:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68066+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68066+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1606714489; cv=none; d=zohomail.com; s=zohoarc; b=J0W6z1PSpWuwNU4L8tRS/VI1vXSvz4aP40fXWWqyjxeNXlGLgRjDW77wm4MyM7DTOeWdTbcOQ/8Hk9+pO2k9XDgfE55WE/VFCqRarkW/+It4SHG6qCxOSIfjFWKTFQysUuEzXqwlv3bS3KyL0KKBDNEHIo47cwBuPUsmlPCzQJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606714489; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=8rYIj+6+RYWeT89MHcvqISqh5n9Gb78VjGjHjLAvkQQ=; b=ckvstVfZiugL3oMl6iNWc2r+DYZRXRCYElaix/bAzHW4kRPr1/SyWo2GcA0h2xuOiNMCOlTL/VjAYUE6EdtbBZbeLreA+xhWu4qnrQbmLJZQ7nRZu5LoEUL+1wUFj31ttVYDgbU/GZffizkPs7WPvlhC09cbOlSKrz705iEvKaQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68066+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606714489099890.5706723037297; Sun, 29 Nov 2020 21:34:49 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id uZyVYY1788612xoTjA9lQhVD; Sun, 29 Nov 2020 21:34:48 -0800 X-Received: from out03.mta.xmission.com (out03.mta.xmission.com [166.70.13.233]) by mx.groups.io with SMTP id smtpd.web09.56189.1606714482781523686 for ; Sun, 29 Nov 2020 21:34:42 -0800 X-Received: from in01.mta.xmission.com ([166.70.13.51]) by out03.mta.xmission.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1kjbph-003n8F-Qg; Sun, 29 Nov 2020 22:34:41 -0700 X-Received: from mta5.zcs.xmission.com ([166.70.13.69]) by in01.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1kjbph-0007Kq-CN; Sun, 29 Nov 2020 22:34:41 -0700 X-Received: from localhost (localhost [127.0.0.1]) by mta5.zcs.xmission.com (Postfix) with ESMTP id 435DA12807A9; Sun, 29 Nov 2020 22:34:41 -0700 (MST) X-Amavis-Modified: Mail body modified (using disclaimer) - mta5.zcs.xmission.com X-Received: from mta5.zcs.xmission.com ([127.0.0.1]) by localhost (mta5.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 9hpv0igKtKUM; Sun, 29 Nov 2020 22:34:41 -0700 (MST) X-Received: from localhost.localdomain (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta5.zcs.xmission.com (Postfix) with ESMTPSA id 02B9212806C1; Sun, 29 Nov 2020 22:34:40 -0700 (MST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Peter Grehan Date: Sun, 29 Nov 2020 22:34:11 -0700 Message-Id: <20201130053412.2-5-rebecca@bsdio.com> In-Reply-To: <20201130053412.2-1-rebecca@bsdio.com> References: <20201130053412.2-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1kjbph-0007Kq-CN;;;mid=<20201130053412.2-5-rebecca@bsdio.com>;;;hst=in01.mta.xmission.com;;;ip=166.70.13.69;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.69 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa03.xmission.com X-Spam-Level: * X-Spam-Status: No, score=1.2 required=8.0 tests=ALL_TRUSTED,BAYES_40, DCC_CHECK_NEGATIVE,T_TooManySym_01,XMNoVowels,XMSubLong autolearn=disabled version=3.4.2 X-Spam-Virus: No X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * -0.0 BAYES_40 BODY: Bayes spam probability is 20 to 40% * [score: 0.2458] * 0.7 XMSubLong Long Subject * 1.5 XMNoVowels Alpha-numberic number with no vowels * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa03 1397; IP=ok Body=1 Fuz1=1] [Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa03 1397; IP=ok Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: *;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 284 ms - load_scoreonly_sql: 0.02 (0.0%), signal_user_changed: 3.6 (1.3%), b_tie_ro: 2.5 (0.9%), parse: 0.73 (0.3%), extract_message_metadata: 9 (3.1%), get_uri_detail_list: 0.82 (0.3%), tests_pri_-1000: 11 (4.0%), tests_pri_-950: 1.00 (0.4%), tests_pri_-900: 0.81 (0.3%), tests_pri_-90: 83 (29.4%), check_bayes: 82 (29.0%), b_tokenize: 5 (1.9%), b_tok_get_all: 5 (1.9%), b_comp_prob: 1.40 (0.5%), b_tok_touch_all: 67 (23.7%), b_finish: 0.71 (0.2%), tests_pri_0: 165 (58.2%), check_dkim_signature: 0.41 (0.1%), check_dkim_adsp: 2.6 (0.9%), poll_dns_idle: 1.22 (0.4%), tests_pri_10: 1.69 (0.6%), tests_pri_500: 5 (1.8%), rewrite_mail: 0.00 (0.0%) Subject: [edk2-devel] [PATCH 4/5] OvmfPkg: Improve style and formatting in BhyveFwCtlLib.h X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: o4UlHpAzEIeGA9K3wkDm0MTcx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606714488; bh=2q0bPq9PnANhaVn8+GGEyw6/B4tVmBUT8N8Xk98sEKA=; h=Cc:Date:From:Reply-To:Subject:To; b=eZ2f02XWk9V5vLHrcARelsR0+BZwNYHf7kh/kT1vQjCmFA6KAco70pnDitggfgRHfsN Ppip9A4ksYqdxobmfHBv04EdlWcxI9RfL7TD0nQsSWJsO8wRpVY3DWfy9vQ5JJA7G/hwt QBUbGmt4YD8+CHvEcZo8P17rLyZGbL+J7dU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" There were some problems with the formatting and style that made the file difficult to read. Signed-off-by: Rebecca Cran Acked-by: Laszlo Ersek --- OvmfPkg/Include/Library/BhyveFwCtlLib.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OvmfPkg/Include/Library/BhyveFwCtlLib.h b/OvmfPkg/Include/Libr= ary/BhyveFwCtlLib.h index 13028ec4b585..07fbd60476d1 100644 --- a/OvmfPkg/Include/Library/BhyveFwCtlLib.h +++ b/OvmfPkg/Include/Library/BhyveFwCtlLib.h @@ -8,8 +8,8 @@ =20 **/ =20 -#ifndef __BHYVE_FW_CTL_LIB__ -#define __BHYVE_FW_CTL_LIB__ +#ifndef _BHYVE_FW_CTL_LIB_ +#define _BHYVE_FW_CTL_LIB_ =20 /** Sysctl-like interface to read host information via a dot-separated @@ -29,19 +29,19 @@ @param[] Data - return buffer pointer @param[] Size - pointer to length =20 - @return RETURN_SUCCESS Valid data/len returned. - RETURN_UNSUPPORTED f/w interface not present. - RETURN_NOT_FOUND OID not found. - RETURN_BUFFER_TOO_SMALL Return message truncated. - RETURN_INVALID_PARAMETER Buffer too large - RETURN_PROTOCOL_ERROR Unknown error from host + @return RETURN_SUCCESS Valid data/len returned. + RETURN_UNSUPPORTED f/w interface not present. + RETURN_NOT_FOUND OID not found. + RETURN_BUFFER_TOO_SMALL Return message truncated. + RETURN_INVALID_PARAMETER Buffer too large. + RETURN_PROTOCOL_ERROR Unknown error from host. **/ RETURN_STATUS EFIAPI BhyveFwCtlGet ( - IN CONST CHAR8 *Name, - OUT VOID *Item, - IN OUT UINTN *Size + IN CONST CHAR8 *Name, + OUT VOID *Item, + IN OUT UINTN *Size ); =20 -#endif +#endif /* _BHYVE_FW_CTL_LIB_ */ --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68066): https://edk2.groups.io/g/devel/message/68066 Mute This Topic: https://groups.io/mt/78602184/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 10:08:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68068+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68068+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1606714485; cv=none; d=zohomail.com; s=zohoarc; b=AM3679OU+aWUEsoeJOqZFnQXeRlIYtg9EaSqYfkVx15obXT0wqyQF5LpSl19CfuUJE/8CYj8Tle0pk6CifG7BcWu5ki9Z76zu/MrWLvP8Bq+yM1QbCXFrpaj6awFGsdIzE4TUCRAg3pzZKjgE2xOvkzulRmKiDaiTYJ4tNnANaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606714485; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=B5IajwGAE7s5DoZNab6OVTjPuCxSEJ8zheKjSmPPIOg=; b=k2fRSDtrXg3TQpO3JlwF35+IIFSWfAa4LS3pOLwLuykH+0bjWf12AZJauTzyNhsEXqCt8y90ESSQxkwhQ00xbGTAgYKjL3Ky+49zg/49EPzKIpBzVBk6RTqPknW5uSEmttMYlJiLdnXRrnNgQywkCZ9Fl7AiXwtpJctXsPuzdhk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68068+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606714485035447.3276240063485; Sun, 29 Nov 2020 21:34:45 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id vcpCYY1788612xQA47h7tbRX; Sun, 29 Nov 2020 21:34:44 -0800 X-Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by mx.groups.io with SMTP id smtpd.web10.55772.1606714483749664404 for ; Sun, 29 Nov 2020 21:34:43 -0800 X-Received: from in02.mta.xmission.com ([166.70.13.52]) by out01.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbpi-003pfZ-W4; Sun, 29 Nov 2020 22:34:43 -0700 X-Received: from mta5.zcs.xmission.com ([166.70.13.69]) by in02.mta.xmission.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbph-000oEk-JB; Sun, 29 Nov 2020 22:34:42 -0700 X-Received: from localhost (localhost [127.0.0.1]) by mta5.zcs.xmission.com (Postfix) with ESMTP id 763A712807AE; Sun, 29 Nov 2020 22:34:41 -0700 (MST) X-Amavis-Modified: Mail body modified (using disclaimer) - mta5.zcs.xmission.com X-Received: from mta5.zcs.xmission.com ([127.0.0.1]) by localhost (mta5.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id owg44pU66lpr; Sun, 29 Nov 2020 22:34:41 -0700 (MST) X-Received: from localhost.localdomain (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta5.zcs.xmission.com (Postfix) with ESMTPSA id 37B24128077E; Sun, 29 Nov 2020 22:34:41 -0700 (MST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Peter Grehan Date: Sun, 29 Nov 2020 22:34:12 -0700 Message-Id: <20201130053412.2-6-rebecca@bsdio.com> In-Reply-To: <20201130053412.2-1-rebecca@bsdio.com> References: <20201130053412.2-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1kjbph-000oEk-JB;;;mid=<20201130053412.2-6-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.69;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.69 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa07.xmission.com X-Spam-Level: *** X-Spam-Status: No, score=3.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,LotsOfNums_01,TM2_M_VERY_LONG_WORD,XMNoVowels autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * 1.5 XMNoVowels Alpha-numberic number with no vowels * 1.2 LotsOfNums_01 BODY: Lots of long strings of numbers * 1.0 TM2_M_VERY_LONG_WORD BODY: Very long word (longer than 40 * chars) * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa07 1397; IP=ok Body=1 Fuz1=1] X-Spam-DCC: XMission; sa07 1397; IP=ok Body=1 Fuz1=1 X-Spam-Combo: ***;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 841 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 12 (1.4%), b_tie_ro: 10 (1.2%), parse: 1.96 (0.2%), extract_message_metadata: 19 (2.3%), get_uri_detail_list: 7 (0.8%), tests_pri_-1000: 15 (1.7%), tests_pri_-950: 1.24 (0.1%), tests_pri_-900: 1.01 (0.1%), tests_pri_-90: 126 (15.0%), check_bayes: 123 (14.6%), b_tokenize: 37 (4.4%), b_tok_get_all: 16 (2.0%), b_comp_prob: 4.5 (0.5%), b_tok_touch_all: 61 (7.3%), b_finish: 1.69 (0.2%), tests_pri_0: 646 (76.8%), check_dkim_signature: 0.99 (0.1%), check_dkim_adsp: 2.9 (0.3%), poll_dns_idle: 0.35 (0.0%), tests_pri_10: 3.0 (0.4%), tests_pri_500: 13 (1.5%), rewrite_mail: 0.00 (0.0%) Subject: [edk2-devel] [PATCH 5/5] OvmfPkg/Bhyve: Fix various style issues X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: UMDVczU8eqQ7OzIXpbNxMMQ2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606714484; bh=d3X9XvGvggkLjJthW6BtbZ2h08JrroHUvGUg5itZ6aA=; h=Cc:Date:From:Reply-To:Subject:To; b=hLAke1E+gw9X43A6v5jiDQRjawjhGtJGfDYgemO1uU3k4HE4p+Bpbf6hMlWHC6TOiG+ bp1R34ApvKxg/lrhbosJW+/PFBLUrl4czPTZ5y/RL4uUIwJjFo2Jb+RDO4tkCtdjed5Hz EJHY2IHXJ2UPqz9OZocclvv0DkA7ZkmkidY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Fix ordering of includes, sources, libraries etc. Remove leading/trailing underscores from include guards. Change INF and DSC version numbers to be decimal. Signed-off-by: Rebecca Cran Acked-by: Laszlo Ersek --- OvmfPkg/Bhyve/BhyveX64.dsc | 2 +- .../Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 +++++++++--------- OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf | 10 +++++----- OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf | 8 +++----- OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf | 12 ++++++------ .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 10 +++++----- OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h | 10 +++------- OvmfPkg/Bhyve/AcpiTables/Platform.h | 2 +- OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h | 6 +++--- OvmfPkg/Bhyve/PlatformPei/Cmos.h | 6 +++--- .../SmbiosPlatformDxe/SmbiosPlatformDxe.h | 7 +++---- OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c | 3 ++- OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c | 2 +- OvmfPkg/Bhyve/PlatformPei/Fv.c | 2 +- OvmfPkg/Bhyve/PlatformPei/Platform.c | 2 +- 15 files changed, 47 insertions(+), 53 deletions(-) diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index c9813097ca32..b93fe30ae4e0 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -17,7 +17,7 @@ [Defines] PLATFORM_NAME =3D Bhyve PLATFORM_GUID =3D 562b76ee-ceb2-4f4f-adfe-a4c8dc46e4ff PLATFORM_VERSION =3D 0.1 - DSC_SPECIFICATION =3D 0x00010005 + DSC_SPECIFICATION =3D 1.30 OUTPUT_DIRECTORY =3D Build/BhyveX64 SUPPORTED_ARCHITECTURES =3D X64 BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/Bh= yve/AcpiPlatformDxe/AcpiPlatformDxe.inf index eec5a42f41e3..595fd055f98a 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -8,7 +8,7 @@ ## =20 [Defines] - INF_VERSION =3D 0x00010005 + INF_VERSION =3D 1.29 BASE_NAME =3D AcpiPlatform FILE_GUID =3D D5F92408-BAB5-44CA-8A60-C212F01D7E9D MODULE_TYPE =3D DXE_DRIVER @@ -24,9 +24,9 @@ [Defines] [Sources] AcpiPlatform.c AcpiPlatform.h + Bhyve.c EntryPoint.c PciDecoding.c - Bhyve.c =20 [Packages] MdePkg/MdePkg.dec @@ -35,17 +35,17 @@ [Packages] UefiCpuPkg/UefiCpuPkg.dec =20 [LibraryClasses] - UefiLib - PcdLib + BaseLib BaseMemoryLib - DebugLib - UefiBootServicesTableLib - UefiDriverEntryPoint BhyveFwCtlLib - MemoryAllocationLib - BaseLib + DebugLib DxeServicesTableLib + MemoryAllocationLib OrderedCollectionLib + PcdLib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiLib =20 [Protocols] gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf b/OvmfPkg/Bhyve/AcpiTa= bles/AcpiTables.inf index 3aab42419ca7..f422793f4938 100644 --- a/OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf +++ b/OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf @@ -12,7 +12,7 @@ ## =20 [Defines] - INF_VERSION =3D 0x00010005 + INF_VERSION =3D 1.29 BASE_NAME =3D PlatformAcpiTables FILE_GUID =3D B4BA6241-936C-4485-A483-9FA832C758CA MODULE_TYPE =3D USER_DEFINED @@ -25,14 +25,14 @@ [Defines] # =20 [Sources] - Platform.h - Madt.aslc + Dsdt.asl Facp.aslc Facs.aslc - Dsdt.asl Hpet.aslc - Spcr.aslc + Madt.aslc Mcfg.aslc + Platform.h + Spcr.aslc =20 [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf b/OvmfPkg/Bhyve/Bhyv= eRfbDxe/BhyveRfbDxe.inf index 5d6e41f0575a..d4016605f343 100644 --- a/OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf +++ b/OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf @@ -10,7 +10,7 @@ ## =20 [Defines] - INF_VERSION =3D 0x00010005 + INF_VERSION =3D 1.29 BASE_NAME =3D EmuGopDxe FILE_GUID =3D 1b290126-5760-424e-8aa2-3faf4d0d7978 MODULE_TYPE =3D UEFI_DRIVER @@ -29,12 +29,11 @@ [Defines] =20 [Sources] ComponentName.c - GopScreen.c - GopDriver.c Gop.h + GopDriver.c + GopScreen.c VbeShim.c =20 - [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec @@ -55,7 +54,6 @@ [LibraryClasses] UefiBootServicesTableLib UefiDriverEntryPoint =20 - [Protocols] gEfiGraphicsOutputProtocolGuid # PROTOCOL BY_START gEfiDevicePathProtocolGuid # PROTOCOL TO_START diff --git a/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf b/OvmfPkg/Bhyve/Plat= formPei/PlatformPei.inf index 7288cff4c8a3..12203e9f804d 100644 --- a/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf @@ -11,7 +11,7 @@ ## =20 [Defines] - INF_VERSION =3D 0x00010005 + INF_VERSION =3D 1.29 BASE_NAME =3D PlatformPei FILE_GUID =3D aa89d903-345b-4ab2-9abf-030b5efb5d50 MODULE_TYPE =3D PEIM @@ -51,15 +51,15 @@ [LibraryClasses] DebugLib HobLib IoLib + LocalApicLib + MemEncryptSevLib + MtrrLib PciLib - ResourcePublicationLib + PeimEntryPoint PeiServicesLib PeiServicesTablePointerLib - PeimEntryPoint - MtrrLib - MemEncryptSevLib PcdLib - LocalApicLib + ResourcePublicationLib =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase diff --git a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPk= g/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index a4cc6e7a565c..12deae7825e6 100644 --- a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -10,7 +10,7 @@ ## =20 [Defines] - INF_VERSION =3D 0x00010005 + INF_VERSION =3D 1.29 BASE_NAME =3D SmbiosPlatformDxe FILE_GUID =3D e2d8a63c-c239-484f-bb21-2917843cc382 MODULE_TYPE =3D DXE_DRIVER @@ -25,9 +25,9 @@ [Defines] # =20 [Sources] + Bhyve.c SmbiosPlatformDxe.h SmbiosPlatformDxe.c - Bhyve.c =20 [Packages] MdePkg/MdePkg.dec @@ -35,14 +35,14 @@ [Packages] OvmfPkg/OvmfPkg.dec =20 [LibraryClasses] - UefiBootServicesTableLib - BaseMemoryLib BaseLib - UefiDriverEntryPoint + BaseMemoryLib DebugLib HobLib MemoryAllocationLib PcdLib + UefiBootServicesTableLib + UefiDriverEntryPoint =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/Bhyve/A= cpiPlatformDxe/AcpiPlatform.h index d30cd11a1dc9..994ee2c7cded 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h @@ -1,5 +1,5 @@ /** @file - Sample ACPI Platform Driver + bhyve ACPI Platform Driver =20 Copyright (c) 2020, Rebecca Cran Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
@@ -11,17 +11,14 @@ #define _ACPI_PLATFORM_H_INCLUDED_ =20 #include - #include #include #include - #include -#include #include #include +#include #include - #include =20 typedef struct { @@ -73,5 +70,4 @@ RestorePciDecoding ( IN UINTN Count ); =20 -#endif - +#endif /* _ACPI_PLATFORM_H_INCLUDED_ */ diff --git a/OvmfPkg/Bhyve/AcpiTables/Platform.h b/OvmfPkg/Bhyve/AcpiTables= /Platform.h index fc43ab411486..c6d43041f36d 100644 --- a/OvmfPkg/Bhyve/AcpiTables/Platform.h +++ b/OvmfPkg/Bhyve/AcpiTables/Platform.h @@ -14,8 +14,8 @@ #define _Platform_h_INCLUDED_ =20 #include -#include #include +#include =20 // // ACPI table information used to initialize tables. diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h b/OvmfPkg/Bhyve/BhyveRfbDxe/Go= p.h index d196a8e6cf93..13cf3976266c 100644 --- a/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h +++ b/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h @@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#ifndef __UGA_H_ -#define __UGA_H_ +#ifndef _GOP_H_ +#define _GOP_H_ =20 #include #include @@ -146,4 +146,4 @@ InstallVbeShim ( IN EFI_PHYSICAL_ADDRESS FrameBufferBase ); =20 -#endif +#endif /* _GOP_H_ */ diff --git a/OvmfPkg/Bhyve/PlatformPei/Cmos.h b/OvmfPkg/Bhyve/PlatformPei/C= mos.h index 3cd98799a3af..ef7901fbeaa8 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Cmos.h +++ b/OvmfPkg/Bhyve/PlatformPei/Cmos.h @@ -6,8 +6,8 @@ =20 **/ =20 -#ifndef __CMOS_H__ -#define __CMOS_H__ +#ifndef _CMOS_H_ +#define _CMOS_H_ =20 /** Reads 8-bits of CMOS data. @@ -46,5 +46,5 @@ CmosWrite8 ( ); =20 =20 -#endif +#endif /* _CMOS_H_ */ =20 diff --git a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/OvmfPkg/= Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h index 1971827be462..12d7be7b2411 100644 --- a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h +++ b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h @@ -13,14 +13,13 @@ #define _SMBIOS_PLATFORM_DXE_H_ =20 #include - #include #include -#include #include #include -#include +#include #include +#include =20 =20 /** @@ -49,4 +48,4 @@ IsEntryPointStructureValid ( IN SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure ); =20 -#endif +#endif /* _SMBIOS_PLATFORM_DXE_H_ */ diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/Bhyve/A= cpiPlatformDxe/AcpiPlatform.c index 31bbf6c474c7..d5c78c61d5ad 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c @@ -1,8 +1,9 @@ /** @file - OVMF ACPI Platform Driver + bhyve ACPI Platform Driver =20 Copyright (c) 2020, Rebecca Cran Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c b/OvmfPkg/Bhyve/AcpiPlat= formDxe/Bhyve.c index 6d42264b654a..01ee89474667 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c @@ -9,8 +9,8 @@ #include "AcpiPlatform.h" =20 #include -#include #include +#include =20 STATIC EFI_STATUS diff --git a/OvmfPkg/Bhyve/PlatformPei/Fv.c b/OvmfPkg/Bhyve/PlatformPei/Fv.c index ee4ecab615f9..94b7e2141562 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Fv.c +++ b/OvmfPkg/Bhyve/PlatformPei/Fv.c @@ -10,8 +10,8 @@ #include "Platform.h" #include #include -#include #include +#include =20 =20 /** diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c b/OvmfPkg/Bhyve/PlatformP= ei/Platform.c index 9f1900626d6b..3a414ffcb738 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Platform.c +++ b/OvmfPkg/Bhyve/PlatformPei/Platform.c @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68068): https://edk2.groups.io/g/devel/message/68068 Mute This Topic: https://groups.io/mt/78602186/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-