From 2aba7f31dbfa0373ca2b1752f4ac2d554e894d2a Mon Sep 17 00:00:00 2001
From: Tao Yuhong <yuhong.tao@intel.com>
Date: Mon, 12 Jul 2021 10:19:20 -0400
Subject: [PATCH] HV: rename splitlock file name

Because the emulation code is for both split-lock and uc-lock,
rename splitlock.c/splitlock.h to lock_instr_emul.c/lock_instr_emul.h

Tracked-On: #6299
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
---
 hypervisor/Makefile                                             | 2 +-
 hypervisor/arch/x86/guest/{splitlock.c => lock_instr_emul.c}    | 2 +-
 hypervisor/arch/x86/guest/virq.c                                | 2 +-
 hypervisor/arch/x86/guest/vmexit.c                              | 2 +-
 .../arch/x86/asm/guest/{splitlock.h => lock_instr_emul.h}       | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename hypervisor/arch/x86/guest/{splitlock.c => lock_instr_emul.c} (99%)
 rename hypervisor/include/arch/x86/asm/guest/{splitlock.h => lock_instr_emul.h} (100%)

diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 71119c3b6..85af66b81 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -316,7 +316,7 @@ VP_DM_C_SRCS += arch/x86/guest/pm.c
 VP_DM_C_SRCS += arch/x86/guest/assign.c
 VP_DM_C_SRCS += arch/x86/guest/vmx_io.c
 VP_DM_C_SRCS += arch/x86/guest/instr_emul.c
-VP_DM_C_SRCS += arch/x86/guest/splitlock.c
+VP_DM_C_SRCS += arch/x86/guest/lock_instr_emul.c
 VP_DM_C_SRCS += arch/x86/guest/vm_reset.c
 VP_DM_C_SRCS += common/ptdev.c
 
diff --git a/hypervisor/arch/x86/guest/splitlock.c b/hypervisor/arch/x86/guest/lock_instr_emul.c
similarity index 99%
rename from hypervisor/arch/x86/guest/splitlock.c
rename to hypervisor/arch/x86/guest/lock_instr_emul.c
index 61488eb04..dd47b3bee 100644
--- a/hypervisor/arch/x86/guest/splitlock.c
+++ b/hypervisor/arch/x86/guest/lock_instr_emul.c
@@ -12,7 +12,7 @@
 #include <asm/cpu_caps.h>
 #include <logmsg.h>
 #include <errno.h>
-#include <asm/guest/splitlock.h>
+#include <asm/guest/lock_instr_emul.h>
 
 static bool is_guest_ac_enabled(struct acrn_vcpu *vcpu)
 {
diff --git a/hypervisor/arch/x86/guest/virq.c b/hypervisor/arch/x86/guest/virq.c
index 076553434..de13a7153 100644
--- a/hypervisor/arch/x86/guest/virq.c
+++ b/hypervisor/arch/x86/guest/virq.c
@@ -14,7 +14,7 @@
 #include <asm/guest/vcpu.h>
 #include <asm/guest/vmcs.h>
 #include <asm/guest/vm.h>
-#include <asm/guest/splitlock.h>
+#include <asm/guest/lock_instr_emul.h>
 #include <trace.h>
 #include <logmsg.h>
 #include <asm/irq.h>
diff --git a/hypervisor/arch/x86/guest/vmexit.c b/hypervisor/arch/x86/guest/vmexit.c
index 9f8a05a0b..affb0237e 100644
--- a/hypervisor/arch/x86/guest/vmexit.c
+++ b/hypervisor/arch/x86/guest/vmexit.c
@@ -14,7 +14,7 @@
 #include <asm/guest/vmexit.h>
 #include <asm/guest/vm_reset.h>
 #include <asm/guest/vmx_io.h>
-#include <asm/guest/splitlock.h>
+#include <asm/guest/lock_instr_emul.h>
 #include <asm/guest/ept.h>
 #include <asm/guest/vept.h>
 #include <asm/vtd.h>
diff --git a/hypervisor/include/arch/x86/asm/guest/splitlock.h b/hypervisor/include/arch/x86/asm/guest/lock_instr_emul.h
similarity index 100%
rename from hypervisor/include/arch/x86/asm/guest/splitlock.h
rename to hypervisor/include/arch/x86/asm/guest/lock_instr_emul.h