From d8d006fab9528234d20f06e5b5b2c052d7b4a5b1 Mon Sep 17 00:00:00 2001 From: Yanyan Shen Date: Tue, 27 Mar 2018 13:33:27 +1100 Subject: [PATCH] armv8/hyp: Add armHSCurVCPU and armHSVCPUActive --- include/arch/arm/arch/64/mode/model/statedata.h | 4 ++++ src/arch/arm/64/model/statedata.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/include/arch/arm/arch/64/mode/model/statedata.h b/include/arch/arm/arch/64/mode/model/statedata.h index 8d7fbd5a0..e47102f8f 100644 --- a/include/arch/arm/arch/64/mode/model/statedata.h +++ b/include/arch/arm/arch/64/mode/model/statedata.h @@ -31,4 +31,8 @@ extern pude_t armKSGlobalKernelPUD[BIT(PUD_INDEX_BITS)] VISIBLE; extern pde_t armKSGlobalKernelPDs[BIT(PUD_INDEX_BITS)][BIT(PD_INDEX_BITS)] VISIBLE; extern pte_t armKSGlobalKernelPT[BIT(PT_INDEX_BITS)] VISIBLE; +#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT +extern vcpu_t *armHSCurVCPU; +extern bool_t armHSVCPUActive; +#endif #endif /* __ARCH_MODEL_STATEDATA_64_H */ diff --git a/src/arch/arm/64/model/statedata.c b/src/arch/arm/64/model/statedata.c index c45af446e..6dec97aba 100644 --- a/src/arch/arm/64/model/statedata.c +++ b/src/arch/arm/64/model/statedata.c @@ -27,3 +27,8 @@ pgde_t armKSGlobalKernelPGD[BIT(PGD_INDEX_BITS)] ALIGN_BSS(BIT(seL4_PGDBits)); pude_t armKSGlobalKernelPUD[BIT(PUD_INDEX_BITS)] ALIGN_BSS(BIT(seL4_PUDBits)); pde_t armKSGlobalKernelPDs[BIT(PUD_INDEX_BITS)][BIT(PD_INDEX_BITS)] ALIGN_BSS(BIT(seL4_PageDirBits)); pte_t armKSGlobalKernelPT[BIT(PT_INDEX_BITS)] ALIGN_BSS(BIT(seL4_PageTableBits)); + +#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT +vcpu_t *armHSCurVCPU; +bool_t armHSVCPUActive; +#endif