Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[edk2-devel] [PATCH v2 0/2] OvmfPkg/Bhyve: Fix Bhyve build following breaking changes in OvmfPkg -- push #1125

Merged
merged 2 commits into from
Nov 13, 2020
Merged

[edk2-devel] [PATCH v2 0/2] OvmfPkg/Bhyve: Fix Bhyve build following breaking changes in OvmfPkg -- push #1125

merged 2 commits into from
Nov 13, 2020

Conversation

lersek
Copy link
Member

@lersek lersek commented Nov 13, 2020

https://www.redhat.com/archives/edk2-devel-archive/2020-November/msg00514.html
https://edk2.groups.io/g/devel/message/67355
msgid 20201112053153.22038-1-rebecca@bsdio.com

Fix Bhyve following breaking changes in OvmfPkg.
Follows suggestions from Laszlo in the v1 patch set.
I also changed the INF version in ResetVector.inf to 1.29.

Rebecca Cran (2):
  OvmfPkg/Bhyve: detach ResetVector from before the SEV-ES changes
  OvmfPkg/Bhyve: fix build breakage after SEV-ES changes

 OvmfPkg/Bhyve/BhyveX64.dsc                    |   3 +-
 OvmfPkg/Bhyve/BhyveX64.fdf                    |   2 +-
 OvmfPkg/Bhyve/ResetVector/ResetVector.inf     |  38 +++++
 .../Bhyve/ResetVector/Ia32/PageTables64.asm   | 149 ++++++++++++++++++
 OvmfPkg/Bhyve/ResetVector/ResetVector.nasmb   |  68 ++++++++
 5 files changed, 258 insertions(+), 2 deletions(-)
 create mode 100644 OvmfPkg/Bhyve/ResetVector/ResetVector.inf
 create mode 100644 OvmfPkg/Bhyve/ResetVector/Ia32/PageTables64.asm
 create mode 100644 OvmfPkg/Bhyve/ResetVector/ResetVector.nasmb

@bcran @lersek
OvmfPkg/Bhyve: detach ResetVector from before the SEV-ES changes
85f7baa 
Commits 6995a1b, 8a27321 and 30937f2 modified all four
regular files under "OvmfPkg/ResetVector" with SEV-ES dependencies.
These are not relevant for Bhyve. Detach the pre-SEV-ES version of
ResetVector for Bhyve.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Message-Id: <20201112053153.22038-2-rebecca@bsdio.com>
Acked-by: Peter Grehan <grehan@freebsd.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
@bcran @lersek
OvmfPkg/Bhyve: fix build breakage after SEV-ES changes
89b995d 
Consume the SEV-ES-independent reset vector restored in the previous
patch. Use the Null instance of VmgExitLib.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Message-Id: <20201112053153.22038-3-rebecca@bsdio.com>
Acked-by: Peter Grehan <grehan@freebsd.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
@lersek lersek added the push Auto push patch series in PR if all checks pass label Nov 13, 2020
@mergify mergify bot merged commit 5e9a8a6 into tianocore:master Nov 13, 2020
@lersek lersek deleted the rebecca_bhyve_resetvector_v2_push branch November 13, 2020 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
push Auto push patch series in PR if all checks pass
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lersek @bcran