HV: modularization to separate CR related code

1. move the CR related code from vmcs/vcpu to vCR source files.
2. also add virtual_cr.h to acrn.doxyfile to avoid doc failure.

Tracked-On: #1842
Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>

Author: mgcao

doc/acrn.doxyfile

@@ -808,6 +808,7 @@ INPUT                  =  custom-doxygen/mainpage.md \
                           ../hypervisor/include/public/acrn_common.h \
                           ../hypervisor/include/public/acrn_hv_defs.h \
                           ../hypervisor/include/arch/x86/guest/vcpu.h \
+                          ../hypervisor/include/arch/x86/virtual_cr.h \
                           ../hypervisor/include/arch/x86/timer.h \
                           ../hypervisor/arch/x86/trusty.c \
                           ../devicemodel/include/virtio.h \

hypervisor/Makefile

@@ -154,6 +154,7 @@ C_SRCS += arch/x86/virq.c
 C_SRCS += arch/x86/vmexit.c
 C_SRCS += arch/x86/vmx.c
 C_SRCS += arch/x86/vmcs.c
+C_SRCS += arch/x86/virtual_cr.c
 C_SRCS += arch/x86/assign.c
 C_SRCS += arch/x86/trusty.c
 C_SRCS += arch/x86/cpu_state_tbl.c

hypervisor/arch/x86/guest/vcpu.c

@@ -8,6 +8,7 @@
 #include <schedule.h>
 #include <vm0_boot.h>
 #include <security.h>
+#include <virtual_cr.h>
 
 inline uint64_t vcpu_get_gpreg(const struct acrn_vcpu *vcpu, uint32_t reg)
 {
@@ -96,55 +97,6 @@ inline void vcpu_set_rflags(struct acrn_vcpu *vcpu, uint64_t val)
 	bitmap_set_lock(CPU_REG_RFLAGS, &vcpu->reg_updated);
 }
 
-inline uint64_t vcpu_get_cr0(struct acrn_vcpu *vcpu)
-{
-	uint64_t mask;
-	struct run_context *ctx =
-		&vcpu->arch.contexts[vcpu->arch.cur_context].run_ctx;
-
-	if (bitmap_test_and_set_lock(CPU_REG_CR0, &vcpu->reg_cached) == 0) {
-		mask = exec_vmread(VMX_CR0_MASK);
-		ctx->cr0 = (exec_vmread(VMX_CR0_READ_SHADOW) & mask) |
-			(exec_vmread(VMX_GUEST_CR0) & (~mask));
-	}
-	return ctx->cr0;
-}
-
-inline void vcpu_set_cr0(struct acrn_vcpu *vcpu, uint64_t val)
-{
-	vmx_write_cr0(vcpu, val);
-}
-
-inline uint64_t vcpu_get_cr2(struct acrn_vcpu *vcpu)
-{
-	return vcpu->
-		arch.contexts[vcpu->arch.cur_context].run_ctx.cr2;
-}
-
-inline void vcpu_set_cr2(struct acrn_vcpu *vcpu, uint64_t val)
-{
-	vcpu->arch.contexts[vcpu->arch.cur_context].run_ctx.cr2 = val;
-}
-
-inline uint64_t vcpu_get_cr4(struct acrn_vcpu *vcpu)
-{
-	uint64_t mask;
-	struct run_context *ctx =
-		&vcpu->arch.contexts[vcpu->arch.cur_context].run_ctx;
-
-	if (bitmap_test_and_set_lock(CPU_REG_CR4, &vcpu->reg_cached) == 0) {
-		mask = exec_vmread(VMX_CR4_MASK);
-		ctx->cr4 = (exec_vmread(VMX_CR4_READ_SHADOW) & mask) |
-			(exec_vmread(VMX_GUEST_CR4) & (~mask));
-	}
-	return ctx->cr4;
-}
-
-inline void vcpu_set_cr4(struct acrn_vcpu *vcpu, uint64_t val)
-{
-	vmx_write_cr4(vcpu, val);
-}
-
 uint64_t vcpu_get_guest_msr(const struct acrn_vcpu *vcpu, uint32_t msr)
 {
 	uint32_t index = vmsr_get_guest_msr_index(msr);