From 5455768059889d4e63a1f744c59afb4254f02280 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Wed, 30 Aug 2023 13:43:04 +0200 Subject: [PATCH] capdl-loader-app: fix location for CDL_VCPU on x86 Resolves issue #54 Signed-off-by: Axel Heider --- capdl-loader-app/include/capdl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/capdl-loader-app/include/capdl.h b/capdl-loader-app/include/capdl.h index e13146c..29de04f 100644 --- a/capdl-loader-app/include/capdl.h +++ b/capdl-loader-app/include/capdl.h @@ -179,9 +179,6 @@ typedef enum { #ifdef CONFIG_ARM_HYPERVISOR_SUPPORT CDL_VCPU = seL4_ARM_VCPUObject, #endif -#ifdef CONFIG_VTX - CDL_VCPU = seL4_X86_VCPUObject, -#endif #elif defined(CONFIG_ARCH_X86) CDL_PT = seL4_X86_PageTableObject, CDL_PD = seL4_X86_PageDirectoryObject, @@ -190,6 +187,9 @@ typedef enum { CDL_PML4 = seL4_X64_PML4Object, CDL_PDPT = seL4_X86_PDPTObject, #endif /* CONFIG_ARCH_X86_64 */ +#ifdef CONFIG_VTX + CDL_VCPU = seL4_X86_VCPUObject, +#endif #endif /* CONFIG_ARCH_X86 */ CDL_ASIDPool = seL4_ObjectTypeCount + 1, CDL_Interrupt = seL4_ObjectTypeCount + 2,