From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.6917.1687179865939794860 for ; Mon, 19 Jun 2023 06:04:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Kt9jH+jb; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687179865; 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=fhMZlod8XjQVZnvC17mj25VPS4KXPcVfxLUHFDqzZEI=; b=Kt9jH+jbmelij6Ojmn7jNXsI5sx+ZiFXAwcZEZY9NhjaLyOI9ZPMWDVifnRYKSNjlljRQH exQXaCcSYMZEx773DkDkzrDZSUtBJXbcbNHP4DubToHTaguOWsN/Yv+YGpawDuU60FNfmR 7XSUEO1mcTp3sdZjQuRkQnMZkyK4yE4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-435-1v-6UD0ONHiId8mkCE41pw-1; Mon, 19 Jun 2023 09:04:21 -0400 X-MC-Unique: 1v-6UD0ONHiId8mkCE41pw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4152C3C0F184; Mon, 19 Jun 2023 13:04:21 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.241]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE7AF2026D49; Mon, 19 Jun 2023 13:04:20 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9ACB818003AB; Mon, 19 Jun 2023 15:04:19 +0200 (CEST) Date: Mon, 19 Jun 2023 15:04:19 +0200 From: "Gerd Hoffmann" To: Corvin =?utf-8?B?S8O2aG5l?= Cc: devel@edk2.groups.io, Ard Biesheuvel , Jiewen Yao , Jordan Justen , Leif Lindholm , Peter Grehan , Rebecca Cran , Sami Mujawar Subject: Re: [PATCH 1/5] OvmfPkg: avoid including AcpiPlatformLib twice Message-ID: References: <20230614075915.141380-1-corvink@FreeBSD.org> <20230614075915.141380-2-corvink@FreeBSD.org> <86c9b635ed392aac2b25b67a8383d1f33654e3f1.camel@FreeBSD.org> MIME-Version: 1.0 In-Reply-To: <86c9b635ed392aac2b25b67a8383d1f33654e3f1.camel@FreeBSD.org> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit 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 > > > Cc: Ard Biesheuvel > > > Cc: Gerd Hoffmann > > > Cc: Jiewen Yao > > > Cc: Jordan Justen > > > Cc: Leif Lindholm > > > Cc: Peter Grehan > > > Cc: Rebecca Cran > > > Cc: Sami Mujawar > > > > 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/DxeAcpiPlatformLib.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/DxeAcpiPlatformLib.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/Library/AcpiPlatformLib/DxeAcpiPlatformLib/OUTPUT/DxeAcpiPlatformLib.obj] Error 1 Looks like UINTN vs. UINT64 take care, Gerd