github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-24 14:33:38 +00:00
Code Issues Projects Releases Wiki Activity

HV: merge sos_pci_dev config to sos macro

Browse Source 
The pci_dev config settings of SOS are same so move the config interface
from vm_configurations.c to CONFIG_SOS_VM macro;

Tracked-On: #4616

Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun 2020-04-13 09:05:16 +08:00 committed by wenlingz
parent 55b50f408f
commit 7282b933fb
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/include/arch/x86/vm_config.h
View File

@ -29,7 +29,9 @@
#define CONFIG_SOS_VM .load_order = SOS_VM, \
.uuid = SOS_VM_UUID, \
.severity = SEVERITY_SOS
.severity = SEVERITY_SOS, \
.pci_dev_num = SOS_EMULATED_PCI_DEV_NUM, \
.pci_devs = sos_pci_devs
#define CONFIG_SAFETY_VM(idx) .load_order = PRE_LAUNCHED_VM, \
.uuid = SAFETY_VM_UUID##idx, \

2
hypervisor/scenarios/hybrid/vm_configurations.c
View File

@ -66,8 +66,6 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.t_vuart.vm_id = 0U,
.t_vuart.vuart_id = 1U,
},
.pci_dev_num = SOS_EMULATED_PCI_DEV_NUM,
.pci_devs = sos_pci_devs,
},
{ /* VM2 */
CONFIG_POST_STD_VM(1),

2
hypervisor/scenarios/industry/vm_configurations.c
View File

@ -36,8 +36,6 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.t_vuart.vm_id = 2U,
.t_vuart.vuart_id = 1U,
},
.pci_dev_num = SOS_EMULATED_PCI_DEV_NUM,
.pci_devs = sos_pci_devs,
},
{ /* VM1 */
CONFIG_POST_STD_VM(1),

2
hypervisor/scenarios/sdc/vm_configurations.c
View File

@ -34,8 +34,6 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.type = VUART_LEGACY_PIO,
.addr.port_base = INVALID_COM_BASE,
},
.pci_dev_num = SOS_EMULATED_PCI_DEV_NUM,
.pci_devs = sos_pci_devs,
},
{ /* VM1 */
CONFIG_POST_STD_VM(1),

2
hypervisor/scenarios/sdc2/vm_configurations.c
View File

@ -34,8 +34,6 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.type = VUART_LEGACY_PIO,
.addr.port_base = INVALID_COM_BASE,
},
.pci_dev_num = SOS_EMULATED_PCI_DEV_NUM,
.pci_devs = sos_pci_devs,
},
{ /* VM1 */
CONFIG_POST_STD_VM(1),