github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-31 07:20:55 +00:00
Code Issues Projects Releases Wiki Activity

HV: replace bootargs config with acrn_vm_os_config

Browse Source 
The member of bootargs in acrn_vm_config will be replaced by
acrn_vm_os_config struct.

Tracked-On: #2291

Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun 2019-01-21 02:56:01 +08:00 committed by Eddie Dong
parent 23f8e5e598
commit 68aa718ca0
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/boot/sbl/multiboot.c
View File

@ -49,8 +49,8 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
vm->sw.kernel_info.kernel_src_addr = hpa2hva((uint64_t)mods[0].mm_mod_start);
vm->sw.kernel_info.kernel_size = mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_load_addr = (void *)(16 * 1024 * 1024UL);
vm->sw.linux_info.bootargs_src_addr = (void *)vm_config->bootargs;
vm->sw.linux_info.bootargs_size = strnlen_s(vm_config->bootargs, MEM_2K);
vm->sw.linux_info.bootargs_src_addr = (void *)vm_config->os_config.bootargs;
vm->sw.linux_info.bootargs_size = strnlen_s(vm_config->os_config.bootargs, MEM_2K);
vm->sw.linux_info.bootargs_load_addr = (void *)(vm_config->memory.size - 8*1024UL);
clac();
ret = 0;

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

@ -217,7 +217,6 @@ struct acrn_vm_config {
#ifdef CONFIG_PARTITION_MODE
bool vm_vuart;
const char *bootargs;
struct vpci_vdev_array *vpci_vdev_array;
bool lapic_pt;
#endif

4
hypervisor/partition/apl-mrb/vm_description.c
View File

@ -146,7 +146,7 @@ struct vm_config_arraies vm_config_partition = {
.memory.start_hpa = 0x100000000UL,
.memory.size = 0x20000000UL, /* uses contiguous memory from host */
.vm_vuart = true,
.bootargs = "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
.os_config.bootargs = "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable xapic_phys",
.vpci_vdev_array = &vpci_vdev_array1,
@ -158,7 +158,7 @@ struct vm_config_arraies vm_config_partition = {
.memory.start_hpa = 0x120000000UL,
.memory.size = 0x20000000UL, /* uses contiguous memory from host */
.vm_vuart = true,
.bootargs = "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
.os_config.bootargs = "root=/dev/sda3 rw rootwait noxsave maxcpus=2 nohpet console=hvc0 \
console=ttyS2 no_timer_check ignore_loglevel log_buf_len=16M \
consoleblank=0 tsc=reliable xapic_phys",
.vpci_vdev_array = &vpci_vdev_array2,

4
hypervisor/partition/dnv-cb2/vm_description.c
View File

@ -180,7 +180,7 @@ struct vm_config_arraies vm_config_partition = {
.memory.start_hpa = 0x100000000UL,
.memory.size = 0x80000000UL, /* uses contiguous memory from host */
.vm_vuart = true,
.bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=4 nohpet console=hvc0 " \
.os_config.bootargs = "root=/dev/sda rw rootwait noxsave maxcpus=4 nohpet console=hvc0 " \
"console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M "\
"consoleblank=0 tsc=reliable xapic_phys apic_debug",
.vpci_vdev_array = &vpci_vdev_array1,
@ -193,7 +193,7 @@ struct vm_config_arraies vm_config_partition = {
.memory.start_hpa = 0x180000000UL,
.memory.size = 0x80000000UL, /* uses contiguous memory from host */
.vm_vuart = true,
.bootargs = "root=/dev/sda2 rw rootwait noxsave maxcpus=4 nohpet console=hvc0 "\
.os_config.bootargs = "root=/dev/sda2 rw rootwait noxsave maxcpus=4 nohpet console=hvc0 "\
"console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M "\
"consoleblank=0 tsc=reliable xapic_phys apic_debug",
.vpci_vdev_array = &vpci_vdev_array2,