hv: Boot multiple OS for Partitioning mode ACRN

ACRN in partitioning mode boots multiple OS. Adding code to parse
VM description structure and a reference description structure for
booting 2 OSes.

Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
This commit is contained in:
Sainath Grandhi
2018-08-08 22:30:57 -07:00
committed by lijinxia
parent 5e32c0227f
commit ff96453993
4 changed files with 130 additions and 1 deletions

View File

@@ -6,7 +6,7 @@
#include <hypervisor.h>
#ifdef CONFIG_VM0_DESC
#if defined(CONFIG_VM0_DESC) && !defined(CONFIG_PARTITION_MODE)
/* Number of CPUs in VM0 */
#define VM0_NUM_CPUS 1
@@ -24,3 +24,79 @@ struct vm_description vm0_desc = {
struct vm_description vm0_desc;
#endif // CONFIG_VM0_DESC
#ifdef CONFIG_PARTITION_MODE
#define NUM_USER_VMS 2U
/**********************/
/* VIRTUAL MACHINE 0 */
/*********************/
/* Number of CPUs in this VM*/
#define VM1_NUM_CPUS 2U
/* Logical CPU IDs assigned to this VM */
int VM1_CPUS[VM1_NUM_CPUS] = {0U, 2U};
/*********************/
/* VIRTUAL MACHINE 1 */
/*********************/
/* Number of CPUs in this VM*/
#define VM2_NUM_CPUS 2U
/* Logical CPU IDs assigned with this VM */
int VM2_CPUS[VM2_NUM_CPUS] = {3U, 1U};
/*******************************/
/* User Defined VM definitions */
/*******************************/
const struct vm_description_array vm_desc_mrb = {
/* Number of user virtual machines */
.num_vm_desc = NUM_USER_VMS,
/* Virtual Machine descriptions */
.vm_desc_array = {
{
/* Internal variable, MUSTBE init to -1 */
.vm_hw_num_cores = VM1_NUM_CPUS,
.vm_pcpu_ids = &VM1_CPUS[0],
.vm_id = 1U,
.bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable"
},
{
/* Internal variable, MUSTBE init to -1 */
.vm_hw_num_cores = VM2_NUM_CPUS,
.vm_pcpu_ids = &VM2_CPUS[0],
.vm_id = 2U,
.bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable"
},
}
};
const struct pcpu_vm_desc_mapping pcpu_vm_desc_map[] = {
{
.vm_desc_ptr = &vm_desc_mrb.vm_desc_array[0],
.is_bsp = true,
},
{
.vm_desc_ptr = &vm_desc_mrb.vm_desc_array[1],
.is_bsp = false,
},
{
.vm_desc_ptr = &vm_desc_mrb.vm_desc_array[0],
.is_bsp = false,
},
{
.vm_desc_ptr = &vm_desc_mrb.vm_desc_array[1],
.is_bsp = true,
},
};
#endif