HV: refine sos_vm config header

The sos_vm config under arch/x86/configs/$(CONFIG_BOARD) folder should be
customer specific configuration, leave it back to customer.

When hypervisor start building, it will check whether BOARD specific sos_vm.h
exist in configs/$(CONFIG_BOARD) folder. If exist, then include this header;
if not, then include default sos_vm config header under configs/default folder.

Tracked-On: #2291

Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>

hypervisor/Makefile

@@ -109,7 +109,16 @@ INCLUDE_PATH += include/dm
 INCLUDE_PATH += bsp/include
 INCLUDE_PATH += boot/include
 INCLUDE_PATH += $(HV_OBJDIR)/include
+
+BOARD_CONFIG_PATH := arch/x86/configs/$(CONFIG_BOARD)
+BOARD_SOS_VM_CONFIG := $(BOARD_CONFIG_PATH)/sos_vm.h
+ifeq ($(CONFIG_PARTITION_MODE),y)
 INCLUDE_PATH += arch/x86/configs/$(CONFIG_BOARD)
+else ifeq (, $(wildcard $(BOARD_SOS_VM_CONFIG)))
+INCLUDE_PATH += arch/x86/configs/default
+else
+INCLUDE_PATH += arch/x86/configs/$(CONFIG_BOARD)
+endif
 
 CC ?= gcc
 AS ?= as

hypervisor/arch/x86/configs/apl-mrb/sos_vm.h

@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SOS_VM_CONFIG_H
-#define SOS_VM_CONFIG_H
-
-#define SOS_VM_CONFIG_NAME		"ACRN SOS VM for APL-MRB"
-#define SOS_VM_CONFIG_MEM_SIZE		0x200000000UL
-#define SOS_VM_CONFIG_PCPU_BITMAP	(PLUG_CPU(0) | PLUG_CPU(1) | PLUG_CPU(2) | PLUG_CPU(3))
-#define SOS_VM_CONFIG_GUEST_FLAGS	IO_COMPLETION_POLLING
-
-#define SOS_VM_CONFIG_OS_NAME		"ClearLinux 26600"
-
-#endif /* SOS_VM_CONFIG_H */

hypervisor/arch/x86/configs/apl-nuc

@@ -1 +0,0 @@
-nuc6cayh

hypervisor/arch/x86/configs/default/sos_vm.h

@@ -3,15 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
 #ifndef SOS_VM_CONFIG_H
 #define SOS_VM_CONFIG_H
 
-#define SOS_VM_CONFIG_NAME		"ACRN SOS VM for APL-UP2"
+#define SOS_VM_CONFIG_NAME		"ACRN SOS VM"
-#define SOS_VM_CONFIG_MEM_SIZE		0x200000000UL
-#define SOS_VM_CONFIG_PCPU_BITMAP	(PLUG_CPU(0) | PLUG_CPU(1))
 #define SOS_VM_CONFIG_GUEST_FLAGS	IO_COMPLETION_POLLING
 
-#define SOS_VM_CONFIG_OS_NAME		"ClearLinux 26600"
+#define SOS_VM_CONFIG_OS_NAME		"ACRN Service OS"
 
 #endif /* SOS_VM_CONFIG_H */

hypervisor/arch/x86/configs/dnv-cb2/sos_vm.h

@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#ifndef SOS_VM_CONFIG_H
-#define SOS_VM_CONFIG_H
-
-#define SOS_VM_CONFIG_NAME		"ACRN SOS VM for DNV-CB2"
-#define SOS_VM_CONFIG_MEM_SIZE		0x400000000UL
-#define SOS_VM_CONFIG_PCPU_BITMAP	(PLUG_CPU(0) | PLUG_CPU(1) | PLUG_CPU(2) | PLUG_CPU(3)	\
-					| PLUG_CPU(4) | PLUG_CPU(5) | PLUG_CPU(6) | PLUG_CPU(7))
-#define SOS_VM_CONFIG_GUEST_FLAGS	IO_COMPLETION_POLLING
-
-#define SOS_VM_CONFIG_OS_NAME		"ClearLinux 26600"
-
-#endif /* SOS_VM_CONFIG_H */

hypervisor/arch/x86/configs/nuc6cayh/sos_vm.h

@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#ifndef SOS_VM_CONFIG_H
-#define SOS_VM_CONFIG_H
-
-#define SOS_VM_CONFIG_NAME		"ACRN SOS VM for APL-NUC"
-#define SOS_VM_CONFIG_MEM_SIZE		0x400000000UL
-#define SOS_VM_CONFIG_PCPU_BITMAP	(PLUG_CPU(0) | PLUG_CPU(1) | PLUG_CPU(2) | PLUG_CPU(3))
-#define SOS_VM_CONFIG_GUEST_FLAGS	IO_COMPLETION_POLLING
-
-#define SOS_VM_CONFIG_OS_NAME		"ClearLinux 26600"
-
-#endif /* SOS_VM_CONFIG_H */

hypervisor/arch/x86/configs/sharing_config.c

@@ -14,7 +14,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] __aligned(PAGE_SIZE) = {
 		.guest_flags = SOS_VM_CONFIG_GUEST_FLAGS,
 		.memory = {
 			.start_hpa = 0x0UL,
-			.size = SOS_VM_CONFIG_MEM_SIZE,
+			.size = CONFIG_SOS_RAM_SIZE,
 		},
 		.os_config = {
 			.name = SOS_VM_CONFIG_OS_NAME,

hypervisor/include/arch/x86/guest/vm.h

@@ -180,8 +180,7 @@ enum acrn_vm_type {
 	UNDEFINED_VM = 0,
 	PRE_LAUNCHED_VM,
 	SOS_VM,
-	NORMAL_VM,
+	NORMAL_VM	/* Post-launched VM */
-	/* PRIVILEGE_VM, */
 };
 
 struct acrn_vm_mem_config {