mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-09-08 12:19:06 +00:00
HV: use separated vm_config.c for each scenario
Previously we use unified vm_config.c for all scenarios and use MACROs for each configuration items, then the initialization of vm_configs[] becomes more complicated when definition of MACROs increase, so change the coding style that all configurable items could be explicitly shown in vm_configuration.c to make code more readable. 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
Eddie Dong
61
hypervisor/scenarios/logical_partition/vm_configurations.c
Normal file
61
hypervisor/scenarios/logical_partition/vm_configurations.c
Normal file
@@ -0,0 +1,61 @@
|
||||
/*
|
||||
* Copyright (C) 2018 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <vm_config.h>
|
||||
#include <vm_configurations.h>
|
||||
#include <acrn_common.h>
|
||||
|
||||
extern struct acrn_vm_pci_ptdev_config vm0_pci_ptdevs[VM0_CONFIG_PCI_PTDEV_NUM];
|
||||
extern struct acrn_vm_pci_ptdev_config vm1_pci_ptdevs[VM1_CONFIG_PCI_PTDEV_NUM];
|
||||
|
||||
struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
|
||||
{ /* VM0 */
|
||||
.type = PRE_LAUNCHED_VM,
|
||||
.name = "ACRN PRE-LAUNCHED VM0",
|
||||
.pcpu_bitmap = VM0_CONFIG_PCPU_BITMAP,
|
||||
.guest_flags = GUEST_FLAG_IO_COMPLETION_POLLING,
|
||||
.clos = 0U,
|
||||
.memory = {
|
||||
.start_hpa = VM0_CONFIG_MEM_START_HPA,
|
||||
.size = VM0_CONFIG_MEM_SIZE,
|
||||
},
|
||||
.os_config = {
|
||||
.name = "ClearLinux",
|
||||
.bootargs = VM0_CONFIG_OS_BOOTARG_CONSOLE \
|
||||
VM0_CONFIG_OS_BOOTARG_MAXCPUS \
|
||||
VM0_CONFIG_OS_BOOTARG_ROOT \
|
||||
"rw rootwait noxsave nohpet console=hvc0 \
|
||||
no_timer_check ignore_loglevel log_buf_len=16M \
|
||||
consoleblank=0 tsc=reliable xapic_phys"
|
||||
},
|
||||
.vm_vuart = true,
|
||||
.pci_ptdev_num = VM0_CONFIG_PCI_PTDEV_NUM,
|
||||
.pci_ptdevs = vm0_pci_ptdevs,
|
||||
},
|
||||
{ /* VM1 */
|
||||
.type = PRE_LAUNCHED_VM,
|
||||
.name = "ACRN PRE-LAUNCHED VM1",
|
||||
.pcpu_bitmap = VM1_CONFIG_PCPU_BITMAP,
|
||||
.guest_flags = GUEST_FLAG_IO_COMPLETION_POLLING,
|
||||
.clos = 0U,
|
||||
.memory = {
|
||||
.start_hpa = VM1_CONFIG_MEM_START_HPA,
|
||||
.size = VM1_CONFIG_MEM_SIZE,
|
||||
},
|
||||
.os_config = {
|
||||
.name = "ClearLinux",
|
||||
.bootargs = VM1_CONFIG_OS_BOOTARG_CONSOLE \
|
||||
VM1_CONFIG_OS_BOOTARG_MAXCPUS \
|
||||
VM1_CONFIG_OS_BOOTARG_ROOT \
|
||||
"rw rootwait noxsave nohpet console=hvc0 \
|
||||
no_timer_check ignore_loglevel log_buf_len=16M \
|
||||
consoleblank=0 tsc=reliable xapic_phys"
|
||||
},
|
||||
.vm_vuart = true,
|
||||
.pci_ptdev_num = VM1_CONFIG_PCI_PTDEV_NUM,
|
||||
.pci_ptdevs = vm1_pci_ptdevs,
|
||||
},
|
||||
};
|
||||
@@ -7,8 +7,6 @@
|
||||
#ifndef VM_CONFIGURATIONS_H
|
||||
#define VM_CONFIGURATIONS_H
|
||||
|
||||
#include <pci_devices.h>
|
||||
|
||||
/* The VM CONFIGs like:
|
||||
* VMX_CONFIG_PCPU_BITMAP
|
||||
* VMX_CONFIG_MEM_START_HPA
|
||||
@@ -19,53 +17,20 @@
|
||||
* might be different on your board, please modify them per your needs.
|
||||
*/
|
||||
|
||||
#define VM0_CONFIGURED
|
||||
|
||||
#define VM0_CONFIG_NAME "ACRN PRE-LAUNCHED VM0"
|
||||
#define VM0_CONFIG_TYPE PRE_LAUNCHED_VM
|
||||
#define VM0_CONFIG_PCPU_BITMAP (PLUG_CPU(0) | PLUG_CPU(2))
|
||||
#define VM0_CONFIG_FLAGS GUEST_FLAG_IO_COMPLETION_POLLING
|
||||
#define VM0_CONFIG_CLOS 0U
|
||||
#define VM0_CONFIG_MEM_START_HPA 0x100000000UL
|
||||
#define VM0_CONFIG_MEM_SIZE 0x20000000UL
|
||||
|
||||
#define VM0_CONFIG_OS_NAME "ClearLinux"
|
||||
#define VM0_CONFIG_OS_BOOTARG_ROOT "root=/dev/sda3 "
|
||||
#define VM0_CONFIG_OS_BOOTARG_MAX_CPUS "max_cpus=2 "
|
||||
#define VM0_CONFIG_OS_BOOTARG_MAXCPUS "maxcpus=2 "
|
||||
#define VM0_CONFIG_OS_BOOTARG_CONSOLE "console=ttyS2 "
|
||||
#define VM0_CONFIG_OS_BOOTARGS VM0_CONFIG_OS_BOOTARG_CONSOLE \
|
||||
VM0_CONFIG_OS_BOOTARG_ROOT \
|
||||
VM0_CONFIG_OS_BOOTARG_MAX_CPUS \
|
||||
"rw rootwait noxsave nohpet console=hvc0 \
|
||||
no_timer_check ignore_loglevel log_buf_len=16M \
|
||||
consoleblank=0 tsc=reliable xapic_phys"
|
||||
#define VM0_CONFIG_PCI_PTDEV_NUM 3U
|
||||
|
||||
#define VM1_CONFIGURED
|
||||
|
||||
#define VM1_CONFIG_NAME "ACRN PRE-LAUNCHED VM1"
|
||||
#define VM1_CONFIG_TYPE PRE_LAUNCHED_VM
|
||||
#define VM1_CONFIG_PCPU_BITMAP (PLUG_CPU(1) | PLUG_CPU(3))
|
||||
#define VM1_CONFIG_FLAGS GUEST_FLAG_IO_COMPLETION_POLLING
|
||||
#define VM1_CONFIG_CLOS 0U
|
||||
#define VM1_CONFIG_MEM_START_HPA 0x120000000UL
|
||||
#define VM1_CONFIG_MEM_SIZE 0x20000000UL
|
||||
|
||||
#define VM1_CONFIG_OS_NAME "ClearLinux"
|
||||
#define VM1_CONFIG_OS_BOOTARG_ROOT "root=/dev/sda3 "
|
||||
#define VM1_CONFIG_OS_BOOTARG_MAX_CPUS "max_cpus=2 "
|
||||
#define VM1_CONFIG_OS_BOOTARG_MAXCPUS "maxcpus=2 "
|
||||
#define VM1_CONFIG_OS_BOOTARG_CONSOLE "console=ttyS2 "
|
||||
#define VM1_CONFIG_OS_BOOTARGS VM1_CONFIG_OS_BOOTARG_CONSOLE \
|
||||
VM1_CONFIG_OS_BOOTARG_ROOT \
|
||||
VM1_CONFIG_OS_BOOTARG_MAX_CPUS \
|
||||
"rw rootwait noxsave nohpet console=hvc0 \
|
||||
no_timer_check ignore_loglevel log_buf_len=16M \
|
||||
consoleblank=0 tsc=reliable xapic_phys"
|
||||
|
||||
|
||||
#define VM0_CONFIG_PCI_PTDEV_NUM 3U
|
||||
extern struct acrn_vm_pci_ptdev_config vm0_pci_ptdevs[VM0_CONFIG_PCI_PTDEV_NUM];
|
||||
|
||||
#define VM1_CONFIG_PCI_PTDEV_NUM 3U
|
||||
extern struct acrn_vm_pci_ptdev_config vm1_pci_ptdevs[VM0_CONFIG_PCI_PTDEV_NUM];
|
||||
|
||||
#endif /* VM_CONFIGURATIONS_H */
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <vm_config.h>
|
||||
#include <vm_configurations.h>
|
||||
|
||||
__unused struct acrn_vm_pci_ptdev_config vm0_pci_ptdevs[VM0_CONFIG_PCI_PTDEV_NUM];
|
||||
25
hypervisor/scenarios/sdc/vm_configurations.c
Normal file
25
hypervisor/scenarios/sdc/vm_configurations.c
Normal file
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* Copyright (C) 2018 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <vm_config.h>
|
||||
#include <vm_configurations.h>
|
||||
#include <acrn_common.h>
|
||||
|
||||
struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
|
||||
{
|
||||
.type = SOS_VM,
|
||||
.name = "ACRN SOS VM",
|
||||
.guest_flags = GUEST_FLAG_IO_COMPLETION_POLLING,
|
||||
.clos = 0U,
|
||||
.memory = {
|
||||
.start_hpa = 0UL,
|
||||
.size = CONFIG_SOS_RAM_SIZE,
|
||||
},
|
||||
.os_config = {
|
||||
.name = "ACRN Service OS",
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -4,26 +4,7 @@
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
/*
|
||||
* This is a template of vm_configurations.h for sharing mode;
|
||||
*/
|
||||
|
||||
#ifndef VM_CONFIGURATIONS_H
|
||||
#define VM_CONFIGURATIONS_H
|
||||
|
||||
#define VM0_CONFIGURED
|
||||
|
||||
#define VM0_CONFIG_NAME "ACRN SOS VM"
|
||||
#define VM0_CONFIG_TYPE SOS_VM
|
||||
#define VM0_CONFIG_PCPU_BITMAP 0UL /* PCPU Bitmap is reserved in SOS_VM */
|
||||
#define VM0_CONFIG_FLAGS GUEST_FLAG_IO_COMPLETION_POLLING
|
||||
#define VM0_CONFIG_CLOS 0U
|
||||
#define VM0_CONFIG_MEM_START_HPA 0UL
|
||||
#define VM0_CONFIG_MEM_SIZE CONFIG_SOS_RAM_SIZE
|
||||
#define VM0_CONFIG_OS_NAME "ACRN Service OS"
|
||||
#define VM0_CONFIG_OS_BOOTARGS "configured in devicemodel/samples/apl-mrb/sos_bootargs_xxxx.txt"
|
||||
|
||||
#define VM0_CONFIG_PCI_PTDEV_NUM 0U /* PTDEV is reserved in SOS_VM */
|
||||
extern struct acrn_vm_pci_ptdev_config vm0_pci_ptdevs[VM0_CONFIG_PCI_PTDEV_NUM];
|
||||
|
||||
#endif /* VM_CONFIGURATIONS_H */
|
||||
|
||||
Reference in New Issue
Block a user