github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

hv: Add vuart flag to VM descriptions in partition mode

Browse Source 
ACRN in partition mode emulates UART for the VMs directly launced
from HV. This patch adds an option to enable/disable vUART for a
VM.

Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
This commit is contained in:
Sainath Grandhi 2018-08-10 11:02:42 -07:00 committed by lijinxia
parent 9e02ef54c7
commit 7380c167ed
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hypervisor/arch/x86/guest/vm.c
View File

@ -201,6 +201,11 @@ int create_vm(struct vm_description *vm_desc, struct vm **rtn_vm)
vm->vpic = vpic_init(vm); vm->vpic = vpic_init(vm);
#ifdef CONFIG_PARTITION_MODE #ifdef CONFIG_PARTITION_MODE
/* Create virtual uart */
if (vm_desc->vm_vuart) {
vm->vuart = vuart_init(vm);
}
vpci_init(vm); vpci_init(vm);
#endif #endif

2
hypervisor/bsp/sbl/vm_description.c
View File

@ -66,6 +66,7 @@ const struct vm_description_array vm_desc_mrb = {
.vm_id = 1U, .vm_id = 1U,
.start_hpa = 0x100000000UL, .start_hpa = 0x100000000UL,
.mem_size = 0x80000000UL, /* uses contiguous memory from host */ .mem_size = 0x80000000UL, /* uses contiguous memory from host */
.vm_vuart = true,
.bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \ .bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \ console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable" consoleblank=0 tsc=reliable"
@ -78,6 +79,7 @@ const struct vm_description_array vm_desc_mrb = {
.vm_id = 2U, .vm_id = 2U,
.start_hpa = 0x180000000UL, .start_hpa = 0x180000000UL,
.mem_size = 0x80000000UL, /* uses contiguous memory from host */ .mem_size = 0x80000000UL, /* uses contiguous memory from host */
.vm_vuart = true,
.bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \ .bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \ console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable" consoleblank=0 tsc=reliable"

1
hypervisor/include/arch/x86/guest/vm.h
View File

@ -190,6 +190,7 @@ struct vm_description {
struct mptable_info *mptable; struct mptable_info *mptable;
uint64_t start_hpa; uint64_t start_hpa;
uint64_t mem_size; /* UOS memory size in hex */ uint64_t mem_size; /* UOS memory size in hex */
bool vm_vuart;
const char *bootargs; const char *bootargs;
struct vpci_vdev_array *vpci_vdev_array; struct vpci_vdev_array *vpci_vdev_array;
#endif #endif