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

hv/acrn-config: changed name from cpu_affinity_bitmap to cpu_affinity

Browse Source 
Tracked-On: #4616
Signed-off-by: Zide Chen <zide.chen@intel.com>
This commit is contained in:
Zide Chen 2020-05-06 12:08:11 -07:00 committed by wenlingz
parent bf1ff8c98f
commit 0629c5c8c2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
CONFIG_SAFETY_VM(1), CONFIG_SAFETY_VM(1),
.name = "ACRN PRE-LAUNCHED VM0", .name = "ACRN PRE-LAUNCHED VM0",
.guest_flags = 0UL, .guest_flags = 0UL,
.cpu_affinity_bitmap = VM0_CONFIG_CPU_AFFINITY, .cpu_affinity = VM0_CONFIG_CPU_AFFINITY,
.memory = { .memory = {
.start_hpa = VM0_CONFIG_MEM_START_HPA, .start_hpa = VM0_CONFIG_MEM_START_HPA,
.size = VM0_CONFIG_MEM_SIZE, .size = VM0_CONFIG_MEM_SIZE,
@ -68,7 +68,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM2 */ { /* VM2 */
CONFIG_POST_STD_VM(1), CONFIG_POST_STD_VM(1),
.cpu_affinity_bitmap = VM2_CONFIG_CPU_AFFINITY, .cpu_affinity = VM2_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,

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

@ -39,7 +39,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM1 */ { /* VM1 */
CONFIG_POST_STD_VM(1), CONFIG_POST_STD_VM(1),
.cpu_affinity_bitmap = VM1_CONFIG_CPU_AFFINITY, .cpu_affinity = VM1_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,
@ -53,7 +53,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
{ /* VM2 */ { /* VM2 */
CONFIG_POST_RT_VM(1), CONFIG_POST_RT_VM(1),
.guest_flags = 0UL, .guest_flags = 0UL,
.cpu_affinity_bitmap = VM2_CONFIG_CPU_AFFINITY, .cpu_affinity = VM2_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,
@ -69,7 +69,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM3 */ { /* VM3 */
CONFIG_POST_STD_VM(2), CONFIG_POST_STD_VM(2),
.cpu_affinity_bitmap = VM3_CONFIG_CPU_AFFINITY, .cpu_affinity = VM3_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,
@ -82,7 +82,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM4 */ { /* VM4 */
CONFIG_POST_STD_VM(3), CONFIG_POST_STD_VM(3),
.cpu_affinity_bitmap = VM4_CONFIG_CPU_AFFINITY, .cpu_affinity = VM4_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,
@ -95,7 +95,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM5 */ { /* VM5 */
CONFIG_POST_STD_VM(4), CONFIG_POST_STD_VM(4),
.cpu_affinity_bitmap = VM5_CONFIG_CPU_AFFINITY, .cpu_affinity = VM5_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,
@ -108,7 +108,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM6 */ { /* VM6 */
CONFIG_POST_STD_VM(5), CONFIG_POST_STD_VM(5),
.cpu_affinity_bitmap = VM6_CONFIG_CPU_AFFINITY, .cpu_affinity = VM6_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,
@ -121,7 +121,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM7 */ { /* VM7 */
CONFIG_KATA_VM(1), CONFIG_KATA_VM(1),
.cpu_affinity_bitmap = VM7_CONFIG_CPU_AFFINITY, .cpu_affinity = VM7_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = COM1_BASE, .addr.port_base = COM1_BASE,

4
hypervisor/scenarios/logical_partition/vm_configurations.c
View File

@ -14,7 +14,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
{ /* VM0 */ { /* VM0 */
CONFIG_PRE_STD_VM(1), CONFIG_PRE_STD_VM(1),
.name = "ACRN PRE-LAUNCHED VM0", .name = "ACRN PRE-LAUNCHED VM0",
.cpu_affinity_bitmap = VM0_CONFIG_CPU_AFFINITY, .cpu_affinity = VM0_CONFIG_CPU_AFFINITY,
.memory = { .memory = {
.start_hpa = VM0_CONFIG_MEM_START_HPA, .start_hpa = VM0_CONFIG_MEM_START_HPA,
.size = VM0_CONFIG_MEM_SIZE, .size = VM0_CONFIG_MEM_SIZE,
@ -48,7 +48,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
{ /* VM1 */ { /* VM1 */
CONFIG_PRE_STD_VM(2), CONFIG_PRE_STD_VM(2),
.name = "ACRN PRE-LAUNCHED VM1", .name = "ACRN PRE-LAUNCHED VM1",
.cpu_affinity_bitmap = VM1_CONFIG_CPU_AFFINITY, .cpu_affinity = VM1_CONFIG_CPU_AFFINITY,
.guest_flags = (GUEST_FLAG_RT | GUEST_FLAG_LAPIC_PASSTHROUGH), .guest_flags = (GUEST_FLAG_RT | GUEST_FLAG_LAPIC_PASSTHROUGH),
.memory = { .memory = {
.start_hpa = VM1_CONFIG_MEM_START_HPA, .start_hpa = VM1_CONFIG_MEM_START_HPA,

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

@ -37,7 +37,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
}, },
{ /* VM1 */ { /* VM1 */
CONFIG_POST_STD_VM(1), CONFIG_POST_STD_VM(1),
.cpu_affinity_bitmap = VM1_CONFIG_CPU_AFFINITY, .cpu_affinity = VM1_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = INVALID_COM_BASE, .addr.port_base = INVALID_COM_BASE,
@ -51,7 +51,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
#if CONFIG_MAX_KATA_VM_NUM > 0 #if CONFIG_MAX_KATA_VM_NUM > 0
{ /* VM2 */ { /* VM2 */
CONFIG_KATA_VM(1), CONFIG_KATA_VM(1),
.cpu_affinity_bitmap = VM2_CONFIG_CPU_AFFINITY, .cpu_affinity = VM2_CONFIG_CPU_AFFINITY,
.vuart[0] = { .vuart[0] = {
.type = VUART_LEGACY_PIO, .type = VUART_LEGACY_PIO,
.addr.port_base = INVALID_COM_BASE, .addr.port_base = INVALID_COM_BASE,

2
misc/acrn-config/scenario_config/vm_configurations_c.py
View File

@ -171,7 +171,7 @@ def cpu_affinity_output(vm_info, i, config):
return return
cpu_bits = vm_info.get_cpu_bitmap(i) cpu_bits = vm_info.get_cpu_bitmap(i)
print("\t\t.cpu_affinity_bitmap = VM{}_CONFIG_CPU_AFFINITY,".format(i), file=config) print("\t\t.cpu_affinity = VM{}_CONFIG_CPU_AFFINITY,".format(i), file=config)
def clos_output(vm_info, i, config): def clos_output(vm_info, i, config):