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.145.155, mailfrom: anthony.perard@citrix.com) Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by groups.io with SMTP; Thu, 04 Jul 2019 07:58:06 -0700 Authentication-Results: esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.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=esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 6drbCJ0VsYo3JqdPNXBIgS8Z9OOILXQNZ0dNRzF1ngFcL9vDVCreRYyAlyQJK5Mk7Ejpgt0l4o Elj1LJx0pk5Gha5/SDqRraYvxaxSbEGlJ0GMnIAU7qMgrGNa3Fih8l05W3A6BOyr2+l9hQgpUr CWMfPGQ/5Axi/kBwB/JV7VWEhFkJKafQNm52E8i206uAcraIHXtO5dLBpcF/dfcnfuIPGQXgd8 nC5x52usQ6i8+B/yoN5a7EOHahEwhvWW4ijHQDgbEkjTtEKRQacrWmWijPQ5om0PtGOtx8Aq+C nEs= X-SBRS: 2.7 X-MesageID: 2602736 X-Ironport-Server: esa3.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="2602736" From: "Anthony PERARD" To: CC: , Ard Biesheuvel , Jordan Justen , Laszlo Ersek , Julien Grall , Anthony PERARD Subject: [PATCH v3 11/35] OvmfPkg/XenPlatformPei: Use mXenHvmloaderInfo to get E820 Date: Thu, 4 Jul 2019 15:42:09 +0100 Message-ID: <20190704144233.27968-12-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 Use the already checked pointer mXenHvmloaderInfo to retrieve the E820 table produced by hvmloader. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1689 Signed-off-by: Anthony PERARD Acked-by: Laszlo Ersek --- OvmfPkg/XenPlatformPei/Xen.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c index d6361da306..9c2ff6324d 100644 --- a/OvmfPkg/XenPlatformPei/Xen.c +++ b/OvmfPkg/XenPlatformPei/Xen.c @@ -53,18 +53,18 @@ XenGetE820Map ( UINT32 *Count=0D )=0D {=0D - EFI_XEN_OVMF_INFO *Info =3D=0D - (EFI_XEN_OVMF_INFO *)(UINTN) OVMF_INFO_PHYSICAL_ADDRESS;=0D + //=0D + // Get E820 produced by hvmloader=0D + //=0D + if (mXenHvmloaderInfo !=3D NULL) {=0D + ASSERT (mXenHvmloaderInfo->E820 < MAX_ADDRESS);=0D + *Entries =3D (EFI_E820_ENTRY64 *)(UINTN) mXenHvmloaderInfo->E820;=0D + *Count =3D mXenHvmloaderInfo->E820EntriesCount;=0D =0D - if (AsciiStrCmp ((CHAR8 *) Info->Signature, "XenHVMOVMF")) {=0D - return EFI_NOT_FOUND;=0D + return EFI_SUCCESS;=0D }=0D =0D - ASSERT (Info->E820 < MAX_ADDRESS);=0D - *Entries =3D (EFI_E820_ENTRY64 *)(UINTN) Info->E820;=0D - *Count =3D Info->E820EntriesCount;=0D -=0D - return EFI_SUCCESS;=0D + return EFI_NOT_FOUND;=0D }=0D =0D /**=0D --=20 Anthony PERARD