From 8f28f884ee04b8784564b16f28478297b03b49d5 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Thu, 21 Mar 2019 13:59:30 +0100 Subject: [PATCH] hw: name vm_state header explicitely Ref #3251 --- .../{imx53/cpu/vm_state.h => arm/cpu/vm_state_trustzone.h} | 0 .../include/spec/arm/cpu/vm_state_virtualization.h} | 0 repos/base-hw/src/core/kernel/vm.h | 2 +- repos/base-hw/src/core/kernel/vm_thread_on.cc | 3 +-- repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc | 1 + repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc | 1 + repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc | 2 +- .../src/core/spec/x86_64/muen/{cpu => kernel}/vm_state.h | 3 +-- repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h | 1 + repos/os/src/server/tz_vmm/include/mmu.h | 2 +- repos/os/src/server/tz_vmm/include/vm_base.h | 2 +- repos/os/src/server/vmm/main.cc | 2 +- 12 files changed, 10 insertions(+), 9 deletions(-) rename repos/base-hw/include/spec/{imx53/cpu/vm_state.h => arm/cpu/vm_state_trustzone.h} (100%) rename repos/{base/include/spec/arndale/cpu/vm_state.h => base-hw/include/spec/arm/cpu/vm_state_virtualization.h} (100%) rename repos/base-hw/src/core/spec/x86_64/muen/{cpu => kernel}/vm_state.h (87%) diff --git a/repos/base-hw/include/spec/imx53/cpu/vm_state.h b/repos/base-hw/include/spec/arm/cpu/vm_state_trustzone.h similarity index 100% rename from repos/base-hw/include/spec/imx53/cpu/vm_state.h rename to repos/base-hw/include/spec/arm/cpu/vm_state_trustzone.h diff --git a/repos/base/include/spec/arndale/cpu/vm_state.h b/repos/base-hw/include/spec/arm/cpu/vm_state_virtualization.h similarity index 100% rename from repos/base/include/spec/arndale/cpu/vm_state.h rename to repos/base-hw/include/spec/arm/cpu/vm_state_virtualization.h diff --git a/repos/base-hw/src/core/kernel/vm.h b/repos/base-hw/src/core/kernel/vm.h index 57a820408..7167a1484 100644 --- a/repos/base-hw/src/core/kernel/vm.h +++ b/repos/base-hw/src/core/kernel/vm.h @@ -14,7 +14,7 @@ #ifndef _CORE__KERNEL__VM_H_ #define _CORE__KERNEL__VM_H_ -#include +namespace Genode { class Vm_state; } /* core includes */ #include diff --git a/repos/base-hw/src/core/kernel/vm_thread_on.cc b/repos/base-hw/src/core/kernel/vm_thread_on.cc index a35f815bc..dc178d4ed 100644 --- a/repos/base-hw/src/core/kernel/vm_thread_on.cc +++ b/repos/base-hw/src/core/kernel/vm_thread_on.cc @@ -24,8 +24,7 @@ void Kernel::Thread::_call_new_vm() return; } - _call_new((Genode::Cpu_state_modes*)user_arg_2(), context, - (void*)user_arg_3()); + _call_new((void*)user_arg_2(), context, (void*)user_arg_3()); } diff --git a/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc b/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc index 78469c77e..0fe993c03 100644 --- a/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc @@ -15,6 +15,7 @@ /* core includes */ #include #include +#include using namespace Kernel; diff --git a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc index 214541312..5f9599ff5 100644 --- a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc @@ -13,6 +13,7 @@ #include #include +#include #include #include diff --git a/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc b/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc index 959601ad5..4389822f7 100644 --- a/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include Kernel::Vm::Vm(void * const state, Kernel::Signal_context * const context, diff --git a/repos/base-hw/src/core/spec/x86_64/muen/cpu/vm_state.h b/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm_state.h similarity index 87% rename from repos/base-hw/src/core/spec/x86_64/muen/cpu/vm_state.h rename to repos/base-hw/src/core/spec/x86_64/muen/kernel/vm_state.h index bd4a45127..f9db21c7f 100644 --- a/repos/base-hw/src/core/spec/x86_64/muen/cpu/vm_state.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm_state.h @@ -16,8 +16,7 @@ namespace Genode { - using Cpu_state_modes = Cpu_state; - using Vm_state = Cpu_state; + struct Vm_state : Cpu_state {}; } #endif /* _CORE__SPEC__X86_64__MUEN__VM_STATE_H_ */ diff --git a/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h b/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h index 287e5bc50..e00432525 100644 --- a/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h +++ b/repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h @@ -24,6 +24,7 @@ #include #include #include +#include namespace Genode { class Vm_session_component; diff --git a/repos/os/src/server/tz_vmm/include/mmu.h b/repos/os/src/server/tz_vmm/include/mmu.h index f55103308..d5af585a9 100644 --- a/repos/os/src/server/tz_vmm/include/mmu.h +++ b/repos/os/src/server/tz_vmm/include/mmu.h @@ -15,7 +15,7 @@ #define _SRC__SERVER__VMM__INCLUDE__MMU_H_ /* base includes */ -#include +#include /* local includes */ #include diff --git a/repos/os/src/server/tz_vmm/include/vm_base.h b/repos/os/src/server/tz_vmm/include/vm_base.h index 7169f78dc..4f1df102e 100644 --- a/repos/os/src/server/tz_vmm/include/vm_base.h +++ b/repos/os/src/server/tz_vmm/include/vm_base.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include /* local includes */ #include diff --git a/repos/os/src/server/vmm/main.cc b/repos/os/src/server/vmm/main.cc index 24922741f..89653826c 100644 --- a/repos/os/src/server/vmm/main.cc +++ b/repos/os/src/server/vmm/main.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include