From 82fa2d6355878ba99319ad3d255943c8109d7485 Mon Sep 17 00:00:00 2001 From: Shuo A Liu Date: Wed, 7 Jul 2021 10:15:07 +0800 Subject: [PATCH] dm: Rename vhm_ioctl_defs.h to hsm_ioctl_defs.h Tracked-On: #6282 Signed-off-by: Shuo A Liu --- devicemodel/include/acpi.h | 2 +- devicemodel/include/mem.h | 2 +- .../include/public/{vhm_ioctl_defs.h => hsm_ioctl_defs.h} | 8 ++++---- devicemodel/include/vmmapi.h | 2 +- doc/acrn.doxyfile | 2 +- misc/services/acrn_manager/Makefile | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename devicemodel/include/public/{vhm_ioctl_defs.h => hsm_ioctl_defs.h} (98%) diff --git a/devicemodel/include/acpi.h b/devicemodel/include/acpi.h index e7fc73198..71ca48b25 100644 --- a/devicemodel/include/acpi.h +++ b/devicemodel/include/acpi.h @@ -29,7 +29,7 @@ #ifndef _ACPI_H_ #define _ACPI_H_ -#include "vhm_ioctl_defs.h" +#include "hsm_ioctl_defs.h" #define SCI_INT 9 diff --git a/devicemodel/include/mem.h b/devicemodel/include/mem.h index 9c3b52efb..c56949370 100644 --- a/devicemodel/include/mem.h +++ b/devicemodel/include/mem.h @@ -29,7 +29,7 @@ #ifndef _MEM_H_ #define _MEM_H_ #include "types.h" -#include "vhm_ioctl_defs.h" +#include "hsm_ioctl_defs.h" struct vmctx; diff --git a/devicemodel/include/public/vhm_ioctl_defs.h b/devicemodel/include/public/hsm_ioctl_defs.h similarity index 98% rename from devicemodel/include/public/vhm_ioctl_defs.h rename to devicemodel/include/public/hsm_ioctl_defs.h index c760271b8..59ac23884 100644 --- a/devicemodel/include/public/vhm_ioctl_defs.h +++ b/devicemodel/include/public/hsm_ioctl_defs.h @@ -44,19 +44,19 @@ */ /** - * @file vhm_ioctl_defs.h + * @file hsm_ioctl_defs.h * - * @brief Virtio and Hypervisor Module definition for ioctl to user space + * @brief Hypervisor Module definition for ioctl to user space */ #ifndef _VHM_IOCTL_DEFS_H_ #define _VHM_IOCTL_DEFS_H_ -/* Commmon structures for ACRN/VHM/DM */ +/* Commmon structures for ACRN/HSM/DM */ #include "acrn_common.h" /* - * Commmon IOCTL ID defination for VHM/DM + * Commmon IOCTL ID defination for HSM/DM */ #define _IC_ID(x, y) (((x)<<24)|(y)) #define IC_ID 0x43UL diff --git a/devicemodel/include/vmmapi.h b/devicemodel/include/vmmapi.h index 9a06c35d7..86343ecc9 100644 --- a/devicemodel/include/vmmapi.h +++ b/devicemodel/include/vmmapi.h @@ -34,7 +34,7 @@ #include "types.h" #include "macros.h" #include "pm.h" -#include "vhm_ioctl_defs.h" +#include "hsm_ioctl_defs.h" /* * API version for out-of-tree consumers for making compile time decisions. diff --git a/doc/acrn.doxyfile b/doc/acrn.doxyfile index d103e1689..16c2653cf 100644 --- a/doc/acrn.doxyfile +++ b/doc/acrn.doxyfile @@ -828,7 +828,7 @@ INPUT = custom-doxygen/mainpage.md \ ../devicemodel/include/vhost.h \ ../devicemodel/include/dm.h \ ../devicemodel/include/pci_core.h \ - ../devicemodel/include/public/vhm_ioctl_defs.h + ../devicemodel/include/public/hsm_ioctl_defs.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/misc/services/acrn_manager/Makefile b/misc/services/acrn_manager/Makefile index e58e61721..af63b81d1 100644 --- a/misc/services/acrn_manager/Makefile +++ b/misc/services/acrn_manager/Makefile @@ -41,7 +41,7 @@ MANAGER_HEADERS += ../../../devicemodel/include/types.h MANAGER_HEADERS += ../../../devicemodel/include/pm.h MANAGER_HEADERS += ../../../devicemodel/include/dm_string.h MANAGER_HEADERS += ../../../devicemodel/include/macros.h -MANAGER_HEADERS += ../../../devicemodel/include/public/vhm_ioctl_defs.h +MANAGER_HEADERS += ../../../devicemodel/include/public/hsm_ioctl_defs.h MANAGER_HEADERS += ../../../devicemodel/include/public/acrn_common.h GCC_MAJOR=$(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1)