diff --git a/repos/base-hw/doc/x86_64_muen.txt b/repos/base-hw/doc/x86_64_muen.txt index 3a2f8164d..fc2c1b6f2 100644 --- a/repos/base-hw/doc/x86_64_muen.txt +++ b/repos/base-hw/doc/x86_64_muen.txt @@ -124,7 +124,7 @@ As a first step acquire the Muen sources by execute the following commands: ! git clone http://git.codelabs.ch/git/muen.git ! cd muen -! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="dbgserver sm tau0 time" emulate +! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="libdebuglog libmutime dbgserver sm tau0 time" emulate This will build a Muen SK system and start it using the Bochs emulator. You should get the following error: @@ -151,7 +151,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="dbgserver sm tau0 time" emulate +! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="libdebuglog libmutime dbgserver sm tau0 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 2a477b39e..e047087b6 100644 --- a/repos/base-hw/ports/muen.hash +++ b/repos/base-hw/ports/muen.hash @@ -1 +1 @@ -b44d41d8d6fc57f5529a8948612dcd29f3031193 +563f198fa5265f2f081f9fb599e22ac95949b88a diff --git a/repos/base-hw/ports/muen.port b/repos/base-hw/ports/muen.port index 835af6a93..8d7e63628 100644 --- a/repos/base-hw/ports/muen.port +++ b/repos/base-hw/ports/muen.port @@ -3,7 +3,7 @@ VERSION := git DOWNLOADS := muen.git URL(muen) := http://git.codelabs.ch/git/muen.git -REV(muen) := c73734dcab0f273756beb6b91977b89b7feb4fbb +REV(muen) := a724693a9e4d64cfc6bd5fe992f569d793d7165f DIR(muen) := src/kernel/muen $(call check_tool,git) diff --git a/repos/ports/src/virtualbox/spec/muen/vcpu.h b/repos/ports/src/virtualbox/spec/muen/vcpu.h index 2d0b5c181..b717c4175 100644 --- a/repos/ports/src/virtualbox/spec/muen/vcpu.h +++ b/repos/ports/src/virtualbox/spec/muen/vcpu.h @@ -47,11 +47,12 @@ struct Segment struct Subject_state { struct Cpu_registers Regs; - Genode::uint64_t Exit_reason; + Genode::uint32_t Exit_reason; + Genode::uint32_t Intr_state; + Genode::uint32_t Interrupt_info; + Genode::uint32_t Sysenter_cs; Genode::uint64_t Exit_qualification; Genode::uint64_t Guest_phys_addr; - Genode::uint64_t Intr_state; - Genode::uint64_t Interrupt_info; Genode::uint64_t Instruction_len; Genode::uint64_t Rip; Genode::uint64_t Rsp; @@ -62,7 +63,6 @@ struct Subject_state Genode::uint64_t Shadow_cr4; Genode::uint64_t Rflags; Genode::uint64_t Ia32_efer; - Genode::uint64_t Sysenter_cs; Genode::uint64_t Sysenter_esp; Genode::uint64_t Sysenter_eip; Segment cs; diff --git a/tool/builddir/etc/build.conf.hw_x86_64_muen b/tool/builddir/etc/build.conf.hw_x86_64_muen index b6ef598fa..6b690bd36 100644 --- a/tool/builddir/etc/build.conf.hw_x86_64_muen +++ b/tool/builddir/etc/build.conf.hw_x86_64_muen @@ -34,7 +34,7 @@ RUN_OPT += --image-muen-system xml/genode-base_hw.xml # Muen system components # # Available components are located in the Muen project directory 'components/'. -RUN_OPT += --image-muen-components 'dbgserver sm tau0 time' +RUN_OPT += --image-muen-components 'libdebuglog libmutime dbgserver sm tau0 time' # # External Muen build