decouple hv sw version and api version

Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>

Author: JasonChenCJ

hypervisor/Makefile

@@ -2,9 +2,12 @@
 # ACRN Hypervisor
 #
 
-
 MAJOR_VERSION=0
 MINOR_VERSION=1
+RC_VERSION=1
+
+API_MAJOR_VERSION=1
+API_MINOR_VERSION=0
 
 RELEASE ?= 0
 
@@ -209,6 +212,9 @@ $(VERSION):
 	cat license_header > $(VERSION);\
 	echo "#define HV_MAJOR_VERSION $(MAJOR_VERSION)" >> $(VERSION);\
 	echo "#define HV_MINOR_VERSION $(MINOR_VERSION)" >> $(VERSION);\
+	echo "#define HV_RC_VERSION $(RC_VERSION)" >> $(VERSION);\
+	echo "#define HV_API_MAJOR_VERSION $(API_MAJOR_VERSION)" >> $(VERSION);\
+	echo "#define HV_API_MINOR_VERSION $(API_MINOR_VERSION)" >> $(VERSION);\
 	echo "#define HV_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION);\
 	echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\
 	echo "#define HV_BUILD_USER "\""$(USER)"\""" >> $(VERSION)

hypervisor/arch/x86/cpu.c

@@ -337,10 +337,19 @@ void bsp_boot_init(void)
 
 #ifdef HV_DEBUG
 	/* Log first messages */
-	printf("HV version %d.%d-%s-%s build by %s, start time %lluus\r\n",
-			HV_MAJOR_VERSION, HV_MINOR_VERSION, HV_BUILD_TIME,
-			HV_BUILD_VERSION, HV_BUILD_USER,
+	if (HV_RC_VERSION)
+		printf("HV version %d.%d-rc%d-%s-%s build by %s, start time %lluus\r\n",
+			HV_MAJOR_VERSION, HV_MINOR_VERSION, HV_RC_VERSION,
+			HV_BUILD_TIME, HV_BUILD_VERSION, HV_BUILD_USER,
 			TICKS_TO_US(start_tsc));
+	else
+		printf("HV version %d.%d-%s-%s build by %s, start time %lluus\r\n",
+			HV_MAJOR_VERSION, HV_MINOR_VERSION,
+			HV_BUILD_TIME, HV_BUILD_VERSION, HV_BUILD_USER,
+			TICKS_TO_US(start_tsc));
+
+	printf("API version %d.%d\r\n",
+			HV_API_MAJOR_VERSION, HV_API_MINOR_VERSION);
 #endif
 	pr_dbg("Core %d is up", CPU_BOOT_ID);
 

hypervisor/common/hypercall.c

@@ -47,8 +47,8 @@ int64_t hcall_get_api_version(struct vm *vm, uint64_t param)
 	if (!is_vm0(vm))
 		return -1;
 
-	version.major_version = HV_MAJOR_VERSION;
-	version.minor_version = HV_MINOR_VERSION;
+	version.major_version = HV_API_MAJOR_VERSION;
+	version.minor_version = HV_API_MINOR_VERSION;
 
 	if (copy_to_vm(vm, &version, param)) {
 		pr_err("%s: Unable copy param to vm\n", __func__);