Update Muen port

- Use latest Muen version
- Sync VirtualBox Muen subject state
- Drop unneccessary subject IP patch
- Adapt Muen RUN_OPTs
- Update documentation

Note: the GPL 2017 toolchain is now required and as the debug output
      format has changed the mulog-subject.py script must be updated on
      autopilot instances.
This commit is contained in:
Adrian-Ken Rueegsegger 2018-01-18 18:50:30 +01:00 committed by Christian Helmuth
parent 97c2699392
commit 9e4ff8c196
6 changed files with 6 additions and 18 deletions

View File

@ -126,7 +126,7 @@ As a first step acquire the Muen sources by executing the following commands:
! cd muen
! git submodule update --init tools/mugenschedcfg
! git submodule update --init components/libxhcidbg
! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="libdebuglog libmutime libxhcidbg dbgserver sm time" emulate
! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="libdebuglog libmudm libmutime libxhcidbg dbgserver sm time" emulate
This will build a Muen SK system and start it using the Bochs emulator. You
should get the following error:
@ -153,7 +153,7 @@ Change back to the Muen working directory to package the system image and
restart emulation:
! cd <muen_workdir>
! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="libdebuglog libmutime dbgserver sm time" emulate
! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="libdebuglog libmudm libmutime libxhcidbg dbgserver sm time" emulate
The serial output of the system is written to the
'<muen_workdir>/emulate/serial.out' file. You should see the following line:

View File

@ -1 +1 @@
ed4aaf70cae8251180a99f2f0dd56322aa73b2a6
f9019aafe61c13c23a320856f684bd13a028697e

View File

@ -1,10 +0,0 @@
+++ src/kernel/muen/policy/xml/genode-base_hw.xml
@@ -102,7 +102,7 @@
</vmx>
<registers>
<gpr>
- <rip>16#0020_000c#</rip>
+ <rip>16#0020_0028#</rip>
<rsp>16#0000#</rsp>
</gpr>
</registers>

View File

@ -3,11 +3,9 @@ VERSION := git
DOWNLOADS := muen.git
URL(muen) := https://git.codelabs.ch/git/muen.git
REV(muen) := 4ffd2c94b1b7de268c0a428855be2e7e8b8f288e
REV(muen) := 41263af9482b85799537d4cad3d79427f153d7d3
DIR(muen) := src/kernel/muen
PATCHES := ports/muen.patch
$(call check_tool,git)
$(call check_tool,iasl)
$(call check_tool,tidy)

View File

@ -50,9 +50,9 @@ struct Subject_state
Genode::uint32_t Exit_reason;
Genode::uint32_t Intr_state;
Genode::uint32_t Sysenter_cs;
Genode::uint32_t Instruction_len;
Genode::uint64_t Exit_qualification;
Genode::uint64_t Guest_phys_addr;
Genode::uint64_t Instruction_len;
Genode::uint64_t Rip;
Genode::uint64_t Rsp;
Genode::uint64_t Cr0;

View File

@ -44,7 +44,7 @@ RUN_OPT += --image-muen-system xml/genode-base_hw.xml
#
# Available components are located in the Muen project directory 'components/'.
#
RUN_OPT += --image-muen-components 'libdebuglog libmutime libxhcidbg dbgserver sm time'
RUN_OPT += --image-muen-components 'libdebuglog libmudm libmutime libxhcidbg dbgserver sm time'
#
# External Muen build