Re: [PATCH 1/5] OvmfPkg: avoid including AcpiPlatformLib twice

["Corvin Köhne" <corvink@FreeBSD.org>]

[-- Attachment #1: Type: text/plain, Size: 2499 bytes --]

On Mon, 2023-06-19 at 15:04 +0200, Gerd Hoffmann wrote:
> On Mon, Jun 19, 2023 at 01:52:19PM +0200, Corvin Köhne wrote:
> > On Mon, 2023-06-19 at 12:41 +0200, Gerd Hoffmann wrote:
> > > On Wed, Jun 14, 2023 at 09:55:43AM +0200, Corvin Köhne wrote:
> > > > Signed-off-by: Corvin Köhne <corvink@FreeBSD.org>
> > > > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > > > Cc: Gerd Hoffmann <kraxel@redhat.com>
> > > > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > > > Cc: Jordan Justen <jordan.l.justen@intel.com>
> > > > Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> > > > Cc: Peter Grehan <grehan@freebsd.org>
> > > > Cc: Rebecca Cran <rebecca@bsdio.com>
> > > > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > > 
> > > Series breaks OvmfPkg/OvmfPkgIa32.dsc build.
> > > 
> > > take care,
> > >   Gerd
> > > 
> > 
> > Hi Gerd,
> > 
> > CI was successful for OvmfPkg/OvmfPkgIa32.dsc:
> > https://github.com/tianocore/edk2/pull/4545
> > https://dev.azure.com/tianocore/edk2-ci/_build/results?buildId=95435&view=results
> 
> /home/kraxel/projects/edk2/OvmfPkg/Library/AcpiPlatformLib/DxeAcpiPla
> tformLib.c:18:1: error: conflicting types for
> ‘GetAcpiRsdpFromMemory’; have ‘EFI_STATUS(UINTN,  UINTN, 
> EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER **)’ {aka ‘unsigned
> int(unsigned int,  unsigned int, 
> EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER **)’}
>    18 | GetAcpiRsdpFromMemory (
>       | ^~~~~~~~~~~~~~~~~~~~~
> In file included from
> /home/kraxel/projects/edk2/OvmfPkg/Library/AcpiPlatformLib/DxeAcpiPla
> tformLib.c:12:
> /home/kraxel/projects/edk2/OvmfPkg/Include/Library/AcpiPlatformLib.h:
> 33:1: note: previous declaration of ‘GetAcpiRsdpFromMemory’ with type
> ‘EFI_STATUS(UINT64,  UINT64, 
> EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER **)’ {aka ‘unsigned
> int(long long unsigned int,  long long unsigned int, 
> EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER **)’}
>    33 | GetAcpiRsdpFromMemory (
>       | ^~~~~~~~~~~~~~~~~~~~~
> make: *** [GNUmakefile:311:
> /home/kraxel/projects/edk2/Build/OvmfIa32/DEBUG_GCC5/IA32/OvmfPkg/Lib
> rary/AcpiPlatformLib/DxeAcpiPlatformLib/OUTPUT/DxeAcpiPlatformLib.obj
> ] Error 1
> 
> Looks like UINTN vs. UINT64
> 
> take care,
>   Gerd
> 

Sry, forgot to send an update of my series. Already fixed it in my PR:
https://github.com/tianocore/edk2/pull/4545/commits/3b7b1e09051228ee0cfb5ef0765a707e4c83bbfc


-- 
Kind regards,
Corvin

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]