diff --git a/repos/base-hw/doc/x86_64_muen.txt b/repos/base-hw/doc/x86_64_muen.txt index 100b9551a..917d9a646 100644 --- a/repos/base-hw/doc/x86_64_muen.txt +++ b/repos/base-hw/doc/x86_64_muen.txt @@ -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 -! 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 '/emulate/serial.out' file. You should see the following line: diff --git a/repos/base-hw/ports/muen.hash b/repos/base-hw/ports/muen.hash index bb5110a52..1bcf2fc22 100644 --- a/repos/base-hw/ports/muen.hash +++ b/repos/base-hw/ports/muen.hash @@ -1 +1 @@ -ed4aaf70cae8251180a99f2f0dd56322aa73b2a6 +f9019aafe61c13c23a320856f684bd13a028697e diff --git a/repos/base-hw/ports/muen.patch b/repos/base-hw/ports/muen.patch deleted file mode 100644 index bd6a068d3..000000000 --- a/repos/base-hw/ports/muen.patch +++ /dev/null @@ -1,10 +0,0 @@ -+++ src/kernel/muen/policy/xml/genode-base_hw.xml -@@ -102,7 +102,7 @@ - - - -- 16#0020_000c# -+ 16#0020_0028# - 16#0000# - - diff --git a/repos/base-hw/ports/muen.port b/repos/base-hw/ports/muen.port index 23ee8eb8f..901f01e13 100644 --- a/repos/base-hw/ports/muen.port +++ b/repos/base-hw/ports/muen.port @@ -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) diff --git a/repos/ports/src/virtualbox/spec/muen/vcpu.h b/repos/ports/src/virtualbox/spec/muen/vcpu.h index d9dadb8ff..2dcff27a0 100644 --- a/repos/ports/src/virtualbox/spec/muen/vcpu.h +++ b/repos/ports/src/virtualbox/spec/muen/vcpu.h @@ -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; diff --git a/tool/builddir/build.conf/run_opt_muen b/tool/builddir/build.conf/run_opt_muen index 194e989ed..cf68a6e08 100644 --- a/tool/builddir/build.conf/run_opt_muen +++ b/tool/builddir/build.conf/run_opt_muen @@ -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