hw: name vm_state header explicitely

Ref #3251

repos/base-hw/src/core/kernel/vm.h

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

repos/base-hw/src/core/kernel/vm_thread_on.cc

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

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

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

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

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

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

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

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_ */

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

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

repos/os/src/server/tz_vmm/include/mmu.h

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

repos/os/src/server/tz_vmm/include/vm_base.h

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

repos/os/src/server/vmm/main.cc

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