From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: citrix.com, ip: 216.71.155.144, mailfrom: anthony.perard@citrix.com) Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by groups.io with SMTP; Thu, 04 Jul 2019 07:58:21 -0700 Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.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=esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: lMI6wxCiDVmZoQ6O5nPQGOJUeX5eumXvSFVoOKmDS/H7Te8zDaib07HXtCPeOKzXA79mmpn3wN hysFfZlus40ca2GVKQi+LJbRMNrnNPjGdYHMDSRWUumr0mCQ5RGMD4X1SoJjfgk3xnXO3ERNOC qKf7BoXe7AsRpa8xEcDuIWdVUIpxIpFw3BJ7TeoVcqLWkyPhafW7PHKIw1deihcFq6QUvNRInb r/oBIqHVfsN5NiyUBu9GKoyY6DwQasZVUjLfZTXVM0UUzeMSySJ0qCWxIQFHq0/nLHxhC75dEd xAc= X-SBRS: 2.7 X-MesageID: 2650937 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,451,1557201600"; d="scan'208";a="2650937" From: "Anthony PERARD" To: CC: , Ard Biesheuvel , Jordan Justen , Laszlo Ersek , Julien Grall , Anthony PERARD Subject: [PATCH v3 28/35] OvmfPkg/PlatformBootManagerLib: Use XenDetected from XenPlatformLib Date: Thu, 4 Jul 2019 15:42:26 +0100 Message-ID: <20190704144233.27968-29-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190704144233.27968-1-anthony.perard@citrix.com> References: <20190704144233.27968-1-anthony.perard@citrix.com> MIME-Version: 1.0 Return-Path: anthony.perard@citrix.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Replace the XenDetected() implementation by the one from XenPlatformLib. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1689 Signed-off-by: Anthony PERARD --- Notes: v3: - new patch .../PlatformBootManagerLib.inf | 1 + .../PlatformBootManagerLib/BdsPlatform.c | 33 +------------------ 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 060a3ab4c5..b2d3b4fb4d 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -54,6 +54,7 @@ [LibraryClasses] UefiLib=0D PlatformBmPrintScLib=0D Tcg2PhysicalPresenceLib=0D + XenPlatformLib=0D =0D [Pcd]=0D gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent=0D diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg= /Library/PlatformBootManagerLib/BdsPlatform.c index 797731a41c..e32969e63e 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -12,6 +12,7 @@ #include =0D #include =0D #include =0D +#include =0D =0D =0D //=0D @@ -1225,38 +1226,6 @@ PciAcpiInitialization ( IoOr16 ((PciRead32 (Pmba) & ~BIT0) + 4, BIT0);=0D }=0D =0D -/**=0D - This function detects if OVMF is running on Xen.=0D -=0D -**/=0D -STATIC=0D -BOOLEAN=0D -XenDetected (=0D - VOID=0D - )=0D -{=0D - EFI_HOB_GUID_TYPE *GuidHob;=0D - STATIC INTN FoundHob =3D -1;=0D -=0D - if (FoundHob =3D=3D 0) {=0D - return FALSE;=0D - } else if (FoundHob =3D=3D 1) {=0D - return TRUE;=0D - }=0D -=0D - //=0D - // See if a XenInfo HOB is available=0D - //=0D - GuidHob =3D GetFirstGuidHob (&gEfiXenInfoGuid);=0D - if (GuidHob =3D=3D NULL) {=0D - FoundHob =3D 0;=0D - return FALSE;=0D - }=0D -=0D - FoundHob =3D 1;=0D - return TRUE;=0D -}=0D -=0D EFI_STATUS=0D EFIAPI=0D ConnectRecursivelyIfPciMassStorage (=0D --=20 Anthony PERARD