From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@bsdio.com header.s=xmission header.b=Ehoq95xQ; spf=none, err=SPF record not found (domain: bsdio.com, ip: 166.70.13.232, mailfrom: rebecca@bsdio.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=bsdio.com; s=xmission; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TLIY9YLoYAOfo4OUa2JyikvqxVePX+WuNzEYmDwpSZs=; b=Ehoq95xQ8J2pm+EVAeq/uDGzMg PHnAhlhP9SHzoPOOcZWf/csCvPS3dOUQtSVB/V+AzZ8n4vxMjcP7Wq17JdUrPVrdoEb9wyrkigZTZ wbGMbDO6kDDFwHHxa+nTuL6SkaS7TMHve55PQ9y+lcSK9DZZYYF07L/cOEadmTEtFsxE=; 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 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 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 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) 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> X-Mailer: git-send-email 2.29.2.windows.2 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: [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) Content-Transfer-Encoding: 8bit Update BhyveFwCtlLib.c to fix problems with UINT32/UINTN types that prevented Bhyve from building with VS2019. Signed-off-by: Rebecca Cran --- OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c b/OvmfPkg/Library/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] = { 'B', 'H', 'Y', 'V' }; STATIC BOOLEAN mBhyveFwCtlSupported = FALSE; -STATIC INTN mBhyveFwCtlTxid = 0xa5; +STATIC INT32 mBhyveFwCtlTxid = 0xa5; /* XXX Maybe a better inbuilt version of this ? */ struct BIoVec { VOID *Base; - UINTN Len; + UINT32 Len; }; struct MsgRxHdr { @@ -86,14 +86,14 @@ BhyveFwCtl_CvtErr ( } STATIC -UINTN +UINT32 EFIAPI BIov_WLen ( IN struct BIoVec b[] ) { - UINTN i; - UINTN tLen; + UINT32 i; + UINT32 tLen; tLen = 0; @@ -106,14 +106,14 @@ BIov_WLen ( } /** - 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; cdata = (UINT8 *)Data; u.w = 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; if (b != NULL) { for (i = 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; /* Set up header as an iovec */ for (i = 0; i < 3; i++) { @@ -200,7 +200,7 @@ BhyveFwCtl_MsgSend( /* Initialize header */ Hdr[0] = BIov_WLen (hIov) + BIov_WLen (Data); - Hdr[1] = OpCode; + Hdr[1] = (UINT32)OpCode; Hdr[2] = mBhyveFwCtlTxid; /* 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; Rd = 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; Req[0].Base = (VOID *)Name; - Req[0].Len = AsciiStrLen (Name) + 1; + Req[0].Len = (UINT32)AsciiStrLen (Name) + 1; Req[1].Base = NULL; Resp[0].Base = Size; - Resp[0].Len = sizeof(UINTN); + Resp[0].Len = sizeof(UINT32); Resp[1].Base = NULL; Status = 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; Req[0].Base = (VOID *)Name; - Req[0].Len = AsciiStrLen(Name) + 1; + Req[0].Len = (UINT32)AsciiStrLen(Name) + 1; Req[1].Base = NULL; Resp[0].Base = &FwGetvalBuf; @@ -363,7 +363,7 @@ BhyveFwCtlGetVal ( * multiple iovecs. */ if ((Status == RETURN_SUCCESS) || (Status == RETURN_BUFFER_TOO_SMALL)) { - *Size = FwGetvalBuf.fSize; + *Size = (UINT32)FwGetvalBuf.fSize; CopyMem (Item, FwGetvalBuf.fData, *Size); } @@ -387,9 +387,9 @@ BhyveFwCtlGet ( return RETURN_UNSUPPORTED; if (Item == NULL) { - Status = BhyveFwCtlGetLen (Name, Size); + Status = BhyveFwCtlGetLen (Name, (UINT32*)Size); } else { - Status = BhyveFwCtlGetVal (Name, Item, Size); + Status = BhyveFwCtlGetVal (Name, Item, (UINT32*)Size); } return Status; @@ -406,7 +406,7 @@ BhyveFwCtlInitialize ( VOID ) { - UINTN i; + UINT32 i; UINT8 ch; DEBUG ((DEBUG_INFO, "FwCtlInitialize\n")); -- 2.29.2.windows.2