From 8c9b9808fadde3d3efcabc3b19d70843e788d690 Mon Sep 17 00:00:00 2001 From: Yonghua Huang Date: Tue, 4 Jan 2022 15:04:48 +0300 Subject: [PATCH] dm: rename ssram source files guest ssram will be virtualized based on tcc driver interface, instead of pass-thru native rtct, rename its source files to avoid confusing: - rename: rtct.c -> vssram.c rtct.h -> vssram.h - move rtct.c from platform/acpci/ to platform/ - new directory 'vssram' to hold vssram source files. Tracked-On: #7010 Signed-off-by: Yonghua Huang Acked-by: Wang Yu1 --- devicemodel/Makefile | 2 +- devicemodel/core/sw_load_common.c | 2 +- devicemodel/hw/platform/acpi/acpi.c | 2 +- devicemodel/hw/platform/{acpi/rtct.c => vssram/vssram.c} | 2 +- devicemodel/include/{rtct.h => vssram.h} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename devicemodel/hw/platform/{acpi/rtct.c => vssram/vssram.c} (99%) rename devicemodel/include/{rtct.h => vssram.h} (100%) diff --git a/devicemodel/Makefile b/devicemodel/Makefile index 3da842612..39dc1cd55 100644 --- a/devicemodel/Makefile +++ b/devicemodel/Makefile @@ -106,7 +106,7 @@ SRCS += hw/platform/ioc.c SRCS += hw/platform/ioc_cbc.c SRCS += hw/platform/pty_vuart.c SRCS += hw/platform/acpi/acpi.c -SRCS += hw/platform/acpi/rtct.c +SRCS += hw/platform/vssram/vssram.c SRCS += hw/platform/acpi/acpi_pm.c SRCS += hw/platform/rpmb/rpmb_sim.c SRCS += hw/platform/rpmb/rpmb_backend.c diff --git a/devicemodel/core/sw_load_common.c b/devicemodel/core/sw_load_common.c index f814d8ee2..1e30712ec 100644 --- a/devicemodel/core/sw_load_common.c +++ b/devicemodel/core/sw_load_common.c @@ -34,7 +34,7 @@ #include "sw_load.h" #include "dm.h" #include "pci_core.h" -#include "rtct.h" +#include "vssram.h" int with_bootargs; static char bootargs[BOOT_ARG_LEN]; diff --git a/devicemodel/hw/platform/acpi/acpi.c b/devicemodel/hw/platform/acpi/acpi.c index e0d7f74e2..4ff8b2791 100644 --- a/devicemodel/hw/platform/acpi/acpi.c +++ b/devicemodel/hw/platform/acpi/acpi.c @@ -71,7 +71,7 @@ #include "vmmapi.h" #include "hpet.h" #include "log.h" -#include "rtct.h" +#include "vssram.h" #include "vmmapi.h" #include "mmio_dev.h" diff --git a/devicemodel/hw/platform/acpi/rtct.c b/devicemodel/hw/platform/vssram/vssram.c similarity index 99% rename from devicemodel/hw/platform/acpi/rtct.c rename to devicemodel/hw/platform/vssram/vssram.c index 8fc66d2aa..db40cf699 100644 --- a/devicemodel/hw/platform/acpi/rtct.c +++ b/devicemodel/hw/platform/vssram/vssram.c @@ -21,7 +21,7 @@ #include "vmmapi.h" #include "acpi.h" #include "log.h" -#include "rtct.h" +#include "vssram.h" #define RTCT_V1 1 #define RTCT_V2 2 diff --git a/devicemodel/include/rtct.h b/devicemodel/include/vssram.h similarity index 100% rename from devicemodel/include/rtct.h rename to devicemodel/include/vssram.h