From 806f4791086aa0c50b6f2c25303ad9acc38a92b4 Mon Sep 17 00:00:00 2001
From: Yonghua Huang <yonghua.huang@intel.com>
Date: Thu, 28 Jan 2021 10:06:09 +0800
Subject: [PATCH] hv: rename RTCM source files

  'ptcm' and 'ptct' are legacy name according
   to the latest TCC spec, hence rename below files
   to avoid confusing:

  ptcm.c -> rtcm.c
  ptcm.h -> rtcm.h
  ptct.h -> rtct.h

Tracked-On: #5649
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
---
 hypervisor/Makefile                            | 2 +-
 hypervisor/acpi_parser/acpi_ext.c              | 2 +-
 hypervisor/arch/x86/cpu.c                      | 2 +-
 hypervisor/arch/x86/guest/ept.c                | 2 +-
 hypervisor/arch/x86/guest/ve820.c              | 2 +-
 hypervisor/arch/x86/guest/vm.c                 | 2 +-
 hypervisor/arch/x86/guest/vmexit.c             | 2 +-
 hypervisor/arch/x86/{ptcm.c => rtcm.c}         | 2 +-
 hypervisor/common/hypercall.c                  | 2 +-
 hypervisor/include/arch/x86/{ptcm.h => rtcm.h} | 2 +-
 hypervisor/include/arch/x86/{ptct.h => rtct.h} | 0
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename hypervisor/arch/x86/{ptcm.c => rtcm.c} (99%)
 rename hypervisor/include/arch/x86/{ptcm.h => rtcm.h} (97%)
 rename hypervisor/include/arch/x86/{ptct.h => rtct.h} (100%)

diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index e1dd39d7a..e18495c51 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -198,7 +198,7 @@ ifeq ($(CONFIG_MULTIBOOT2),y)
 BOOT_C_SRCS += boot/multiboot/multiboot2.c
 endif
 BOOT_C_SRCS += boot/reloc.c
-BOOT_C_SRCS += arch/x86/ptcm.c
+BOOT_C_SRCS += arch/x86/rtcm.c
 
 # hardware management component
 HW_S_SRCS += arch/x86/idt.S
diff --git a/hypervisor/acpi_parser/acpi_ext.c b/hypervisor/acpi_parser/acpi_ext.c
index 3237804f9..df3f418f9 100644
--- a/hypervisor/acpi_parser/acpi_ext.c
+++ b/hypervisor/acpi_parser/acpi_ext.c
@@ -35,7 +35,7 @@
 #include <host_pm.h>
 #include <pci.h>
 #include <acrn_common.h>
-#include <ptcm.h>
+#include <rtcm.h>
 
 /* Per ACPI spec:
  * There are two fundamental types of ACPI tables:
diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index 859bda103..a101b8d41 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -28,7 +28,7 @@
 #include <uart16550.h>
 #include <vpci.h>
 #include <ivshmem.h>
-#include <ptcm.h>
+#include <rtcm.h>
 
 #define CPU_UP_TIMEOUT		100U /* millisecond */
 #define CPU_DOWN_TIMEOUT	100U /* millisecond */
diff --git a/hypervisor/arch/x86/guest/ept.c b/hypervisor/arch/x86/guest/ept.c
index a4dd7ade9..e6a1bce0c 100644
--- a/hypervisor/arch/x86/guest/ept.c
+++ b/hypervisor/arch/x86/guest/ept.c
@@ -15,7 +15,7 @@
 #include <vtd.h>
 #include <logmsg.h>
 #include <trace.h>
-#include <ptct.h>
+#include <rtct.h>
 
 #define DBG_LEVEL_EPT	6U
 
diff --git a/hypervisor/arch/x86/guest/ve820.c b/hypervisor/arch/x86/guest/ve820.c
index ec669e949..1c94f95b0 100644
--- a/hypervisor/arch/x86/guest/ve820.c
+++ b/hypervisor/arch/x86/guest/ve820.c
@@ -10,7 +10,7 @@
 #include <reloc.h>
 #include <vacpi.h>
 #include <logmsg.h>
-#include <ptcm.h>
+#include <rtcm.h>
 
 #define ENTRY_HPA1_LOW_PART1	2U
 #define ENTRY_HPA1_LOW_PART2	4U
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 4818fe650..e60f5f8fa 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -35,7 +35,7 @@
 #include <trampoline.h>
 #include <assign.h>
 #include <vgpio.h>
-#include <ptcm.h>
+#include <rtcm.h>
 
 /* Local variables */
 
diff --git a/hypervisor/arch/x86/guest/vmexit.c b/hypervisor/arch/x86/guest/vmexit.c
index cdb22e881..1bd6ba9a0 100644
--- a/hypervisor/arch/x86/guest/vmexit.c
+++ b/hypervisor/arch/x86/guest/vmexit.c
@@ -19,7 +19,7 @@
 #include <vtd.h>
 #include <vcpuid.h>
 #include <trace.h>
-#include <ptcm.h>
+#include <rtcm.h>
 
 /*
  * According to "SDM APPENDIX C VMX BASIC EXIT REASONS",
diff --git a/hypervisor/arch/x86/ptcm.c b/hypervisor/arch/x86/rtcm.c
similarity index 99%
rename from hypervisor/arch/x86/ptcm.c
rename to hypervisor/arch/x86/rtcm.c
index 1b7189411..82e0fb2da 100644
--- a/hypervisor/arch/x86/ptcm.c
+++ b/hypervisor/arch/x86/rtcm.c
@@ -8,7 +8,7 @@
 #include <logmsg.h>
 #include <misc_cfg.h>
 #include <mmu.h>
-#include <ptcm.h>
+#include <rtcm.h>
 
 
 uint64_t psram_area_bottom;
diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c
index 408d1c0a7..841472a13 100644
--- a/hypervisor/common/hypercall.c
+++ b/hypervisor/common/hypercall.c
@@ -22,7 +22,7 @@
 #include <mmio_dev.h>
 #include <ivshmem.h>
 #include <vmcs9900.h>
-#include <ptcm.h>
+#include <rtcm.h>
 
 #define DBG_LEVEL_HYCALL	6U
 
diff --git a/hypervisor/include/arch/x86/ptcm.h b/hypervisor/include/arch/x86/rtcm.h
similarity index 97%
rename from hypervisor/include/arch/x86/ptcm.h
rename to hypervisor/include/arch/x86/rtcm.h
index 1a82de546..17d7296d9 100644
--- a/hypervisor/include/arch/x86/ptcm.h
+++ b/hypervisor/include/arch/x86/rtcm.h
@@ -7,7 +7,7 @@
 #ifndef PTCM_H
 #define PTCM_H
 
-#include <ptct.h>
+#include <rtct.h>
 
 #define MSABI __attribute__((ms_abi))
 
diff --git a/hypervisor/include/arch/x86/ptct.h b/hypervisor/include/arch/x86/rtct.h
similarity index 100%
rename from hypervisor/include/arch/x86/ptct.h
rename to hypervisor/include/arch/x86/rtct.h