ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 09:46:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Muen port

Browse Source 
- Adjust list of Muen components
- vbox: Sync hw_x86_64_muen subject state with Muen SK
This commit is contained in:
Adrian-Ken Rueegsegger 2016-07-19 18:26:52 +02:00 committed by Christian Helmuth
parent 1ae0357171
commit dd22c961c9
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/base-hw/doc/x86_64_muen.txt
View File

@ -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 <muen_workdir>
! 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
'<muen_workdir>/emulate/serial.out' file. You should see the following line:

2
repos/base-hw/ports/muen.hash
View File

@ -1 +1 @@
b44d41d8d6fc57f5529a8948612dcd29f3031193
563f198fa5265f2f081f9fb599e22ac95949b88a

2
repos/base-hw/ports/muen.port
View File

@ -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)

8
repos/ports/src/virtualbox/spec/muen/vcpu.h
View File

@ -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;

2
tool/builddir/etc/build.conf.hw_x86_64_muen
View File

@ -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