From nobody Thu Nov 14 16:57:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45538+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1565697465; cv=none; d=zoho.com; s=zohoarc; b=P8OPRVo3Cfp6MuBNfpCocpuatqewABTIXXoKfvpfxpUL4vsULDzKAAOjXabxyD63fh3FVWaL6ArfO/7WL9oduWgMX7fDO0vDI2lH9Z75NOtfO5GNoKupnBSVWLaA9GCrJgQ0E07qXJdGLfZGN7x6EzZ3kQ1r7R3nrC5GeuHTOTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565697465; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=KT39GEO6BqKU9WGjVEPL1hznKhN3O8ysdqRzgfiL1Yg=; b=PPxUphu7qRSbIYGRh8WxIxKKriO74TOv2IqtdlXF3QJOLL87kkMzP8jkhimkdWjTuDYJzuNcMeQXFiAKo9D1wyu7tdD8HSrkubArG7QEd3QYWYcr4D8LBmo9XzBAKa5LjZBYO9U8Ztd21AN53M03SGNznM2fDpmyZ4hUSat/HNg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45538+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1565697465008285.82505612362377; Tue, 13 Aug 2019 04:57:45 -0700 (PDT) Return-Path: X-Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com []) by groups.io with SMTP; Tue, 13 Aug 2019 04:57:43 -0700 Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+45538+1787277+3901457@groups.io; helo=web01.groups.io; Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: XJ7aHeML77RlHXWSMObqCWwI21TLVYaeVeX/tyh3auEIF4cvE9eqE6rxJjEiGRGclgIAHWMmOr EgajjgLc15PF+VyCeQBU8wGyZ2OkjDN3uv2JBz+tqjD42W537YcOQE/kslTi1HpuktSHmplJoz SYgh5Gw+A/7vFcx04qdNMIW1+EdkTS7PxMT/7EnpNNfj8PToidBZQFjDiKg6MsLQoCLc2FgbPY fpL63a0TXJX1+2MK+8Ttup6jrusD57OL0j1fMlyWyQEw4yTV4dBx1837Tk9wlPlljPPgD/1EQg M6A= X-SBRS: 2.7 X-MesageID: 4374816 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,381,1559534400"; d="scan'208";a="4374816" From: "Anthony PERARD" To: CC: Laszlo Ersek , Jordan Justen , Julien Grall , , Ard Biesheuvel , Anthony PERARD Subject: [edk2-devel] [PATCH v5 27/35] OvmfPkg/PlatformBootManagerLib: Use XenDetected from XenPlatformLib Date: Tue, 13 Aug 2019 12:31:11 +0100 Message-ID: <20190813113119.14804-28-anthony.perard@citrix.com> In-Reply-To: <20190813113119.14804-1-anthony.perard@citrix.com> References: <20190813113119.14804-1-anthony.perard@citrix.com> MIME-Version: 1.0 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,anthony.perard@citrix.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1565697464; bh=KT39GEO6BqKU9WGjVEPL1hznKhN3O8ysdqRzgfiL1Yg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YCkBGivQ+RufFzP4IAAmhbhHIvj+nvCCNx2bg4trZ91nuG94Q1XR65v5hgfz5G4vqwp l9u1KYq+Fi4bQzuuivpIk6BgP7QJQCaHfJpqX5kprnePlbo9miAcZsPXIUf9tHnt2UVRw RNyfv31fx4AWmgIPq5BZ32AQpOCVF3QnyUQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Replace the XenDetected() implementation by the one from XenPlatformLib. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1689 Signed-off-by: Anthony PERARD Reviewed-by: Laszlo Ersek --- Notes: v4: - removed gEfiXenInfoGuid from Guids list and the associated include of Guid/XenInfo.h =20 v3: - new patch .../PlatformBootManagerLib.inf | 2 +- .../PlatformBootManagerLib/BdsPlatform.c | 34 +------------------ 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 060a3ab4c5..04d614cd49 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -54,6 +54,7 @@ [LibraryClasses] UefiLib PlatformBmPrintScLib Tcg2PhysicalPresenceLib + XenPlatformLib =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent @@ -73,7 +74,6 @@ [Protocols] gEfiFirmwareVolume2ProtocolGuid # PROTOCOL SOMETIMES_CONSU= MED =20 [Guids] - gEfiXenInfoGuid gEfiEndOfDxeEventGroupGuid gRootBridgesConnectedEventGroupGuid gUefiShellFileGuid diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg= /Library/PlatformBootManagerLib/BdsPlatform.c index 797731a41c..d5d5d20fd8 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -7,11 +7,11 @@ **/ =20 #include "BdsPlatform.h" -#include #include #include #include #include +#include =20 =20 // @@ -1225,38 +1225,6 @@ PciAcpiInitialization ( IoOr16 ((PciRead32 (Pmba) & ~BIT0) + 4, BIT0); } =20 -/** - This function detects if OVMF is running on Xen. - -**/ -STATIC -BOOLEAN -XenDetected ( - VOID - ) -{ - EFI_HOB_GUID_TYPE *GuidHob; - STATIC INTN FoundHob =3D -1; - - if (FoundHob =3D=3D 0) { - return FALSE; - } else if (FoundHob =3D=3D 1) { - return TRUE; - } - - // - // See if a XenInfo HOB is available - // - GuidHob =3D GetFirstGuidHob (&gEfiXenInfoGuid); - if (GuidHob =3D=3D NULL) { - FoundHob =3D 0; - return FALSE; - } - - FoundHob =3D 1; - return TRUE; -} - EFI_STATUS EFIAPI ConnectRecursivelyIfPciMassStorage ( --=20 Anthony PERARD -=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 (#45538): https://edk2.groups.io/g/devel/message/45538 Mute This Topic: https://groups.io/mt/32851682/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-