github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 13:37:10 +00:00
Code Issues Projects Releases Wiki Activity

Makefile: add build tag for acrn-config tool in version.h

Browse Source 
Add " with acrn-config" tag in build info when user build hypervisor with
acrn-config xmls would be helpful to identify the hypervisor configuration
in current build is from acrn-config xml or from source code.

Tracked-On: #3602

Signed-off-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Victor Sun 2019-09-20 10:16:05 +08:00 committed by wenlingz
parent 3f3ec3865e
commit 153a5992f5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/Makefile
View File

@ -394,6 +394,7 @@ ifneq ($(BOARD_FILE)$(SCENARIO_FILE),)
@cat $(HV_OBJDIR)/.cfg_src_result @cat $(HV_OBJDIR)/.cfg_src_result
@if [ "`sed -n /successfully/p $(HV_OBJDIR)/.cfg_src_result`" = "" ]; then exit 1; fi @if [ "`sed -n /successfully/p $(HV_OBJDIR)/.cfg_src_result`" = "" ]; then exit 1; fi
@echo "Import hypervisor configurations from Config-xmls, configurations in source code are ignored!" @echo "Import hypervisor configurations from Config-xmls, configurations in source code are ignored!"
@sed -i 's/#define HV_CONFIG_TOOL ""/#define HV_CONFIG_TOOL " with acrn-config"/g' $(VERSION)
else else
@echo "Use hypervisor configurations from source code directly." @echo "Use hypervisor configurations from source code directly."
endif endif
@ -505,6 +506,7 @@ $(VERSION):
echo "#define HV_BUILD_TYPE "\""$$BUILD_TYPE"\""" >> $(VERSION);\ echo "#define HV_BUILD_TYPE "\""$$BUILD_TYPE"\""" >> $(VERSION);\
echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\ echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\
echo "#define HV_BUILD_USER "\""$$USER"\""" >> $(VERSION);\ echo "#define HV_BUILD_USER "\""$$USER"\""" >> $(VERSION);\
echo "#define HV_CONFIG_TOOL \"\"" >> $(VERSION);\
echo "#endif" >> $(VERSION) echo "#endif" >> $(VERSION)
-include $(C_OBJS:.o=.d) -include $(C_OBJS:.o=.d)

4
hypervisor/arch/x86/cpu.c
View File

@ -192,11 +192,11 @@ void init_pcpu_post(uint16_t pcpu_id)
/* Calibrate TSC Frequency */ /* Calibrate TSC Frequency */
calibrate_tsc(); calibrate_tsc();
pr_acrnlog("HV version %s-%s-%s %s (daily tag:%s) build by %s, start time %lluus", pr_acrnlog("HV version %s-%s-%s %s (daily tag:%s) build by %s%s, start time %lluus",
HV_FULL_VERSION, HV_FULL_VERSION,
HV_BUILD_TIME, HV_BUILD_VERSION, HV_BUILD_TYPE, HV_BUILD_TIME, HV_BUILD_VERSION, HV_BUILD_TYPE,
HV_DAILY_TAG, HV_DAILY_TAG,
HV_BUILD_USER, ticks_to_us(start_tsc)); HV_BUILD_USER, HV_CONFIG_TOOL, ticks_to_us(start_tsc));
pr_acrnlog("API version %u.%u", pr_acrnlog("API version %u.%u",
HV_API_MAJOR_VERSION, HV_API_MINOR_VERSION); HV_API_MAJOR_VERSION, HV_API_MINOR_VERSION);