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

hw: name vm_state header explicitely

Browse Source 
Ref #3251
This commit is contained in:
Stefan Kalkowski 2019-03-21 13:59:30 +01:00 committed by Norman Feske
parent 4c492a3be7
commit 8f28f884ee
12 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
repos/base-hw/include/spec/imx53/cpu/vm_state.h → repos/base-hw/include/spec/arm/cpu/vm_state_trustzone.h
View File

0
repos/base/include/spec/arndale/cpu/vm_state.h → repos/base-hw/include/spec/arm/cpu/vm_state_virtualization.h
View File

2
repos/base-hw/src/core/kernel/vm.h
View File

@ -14,7 +14,7 @@
#ifndef _CORE__KERNEL__VM_H_ #ifndef _CORE__KERNEL__VM_H_
#define _CORE__KERNEL__VM_H_ #define _CORE__KERNEL__VM_H_
#include <cpu/vm_state.h> namespace Genode { class Vm_state; }
/* core includes */ /* core includes */
#include <kernel/cpu_context.h> #include <kernel/cpu_context.h>

3
repos/base-hw/src/core/kernel/vm_thread_on.cc
View File

@ -24,8 +24,7 @@ void Kernel::Thread::_call_new_vm()
return; return;
} }
_call_new<Vm>((Genode::Cpu_state_modes*)user_arg_2(), context, _call_new<Vm>((void*)user_arg_2(), context, (void*)user_arg_3());
(void*)user_arg_3());
} }

1
repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc
View File

@ -15,6 +15,7 @@
/* core includes */ /* core includes */
#include <kernel/cpu.h> #include <kernel/cpu.h>
#include <kernel/vm.h> #include <kernel/vm.h>
#include <cpu/vm_state_trustzone.h>
using namespace Kernel; using namespace Kernel;

1
repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc
View File

@ -13,6 +13,7 @@
#include <base/log.h> #include <base/log.h>
#include <hw/assert.h> #include <hw/assert.h>
#include <cpu/vm_state_virtualization.h>
#include <platform_pd.h> #include <platform_pd.h>
#include <kernel/cpu.h> #include <kernel/cpu.h>

2
repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc
View File

@ -17,7 +17,7 @@
#include <platform_pd.h> #include <platform_pd.h>
#include <kernel/cpu.h> #include <kernel/cpu.h>
#include <kernel/vm.h> #include <kernel/vm.h>
#include <cpu/cpu_state.h> #include <kernel/vm_state.h>
#include <pic.h> #include <pic.h>
Kernel::Vm::Vm(void * const state, Kernel::Signal_context * const context, Kernel::Vm::Vm(void * const state, Kernel::Signal_context * const context,

3
repos/base-hw/src/core/spec/x86_64/muen/cpu/vm_state.h → repos/base-hw/src/core/spec/x86_64/muen/kernel/vm_state.h
View File

@ -16,8 +16,7 @@
namespace Genode namespace Genode
{ {
using Cpu_state_modes = Cpu_state; struct Vm_state : Cpu_state {};
using Vm_state = Cpu_state;
} }
#endif /* _CORE__SPEC__X86_64__MUEN__VM_STATE_H_ */ #endif /* _CORE__SPEC__X86_64__MUEN__VM_STATE_H_ */

1
repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h
View File

@ -24,6 +24,7 @@
#include <dataspace_component.h> #include <dataspace_component.h>
#include <object.h> #include <object.h>
#include <kernel/vm.h> #include <kernel/vm.h>
#include <kernel/vm_state.h>
namespace Genode { namespace Genode {
class Vm_session_component; class Vm_session_component;

2
repos/os/src/server/tz_vmm/include/mmu.h
View File

@ -15,7 +15,7 @@
#define _SRC__SERVER__VMM__INCLUDE__MMU_H_ #define _SRC__SERVER__VMM__INCLUDE__MMU_H_
/* base includes */ /* base includes */
#include <cpu/vm_state.h> #include <cpu/vm_state_trustzone.h>
/* local includes */ /* local includes */
#include <ram.h> #include <ram.h>

2
repos/os/src/server/tz_vmm/include/vm_base.h
View File

@ -20,7 +20,7 @@
#include <rom_session/connection.h> #include <rom_session/connection.h>
#include <vm_session/connection.h> #include <vm_session/connection.h>
#include <util/noncopyable.h> #include <util/noncopyable.h>
#include <cpu/vm_state.h> #include <cpu/vm_state_trustzone.h>
/* local includes */ /* local includes */
#include <ram.h> #include <ram.h>

2
repos/os/src/server/vmm/main.cc
View File

@ -27,7 +27,7 @@
#include <util/mmio.h> #include <util/mmio.h>
#include <vm_session/connection.h> #include <vm_session/connection.h>
#include <cpu/vm_state.h> #include <cpu/vm_state_virtualization.h>
#include <board.h> #include <board.h>