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

config_tool: let common.MAX_VM_NUM controlled by scenario data

Browse Source 
let common.MAX_VM_NUM controlled by scenario data

Tracked-On: #6685
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>
This commit is contained in:
Weiyi Feng 2021-11-09 12:03:13 +08:00 committed by wenlingz
parent 0031637400
commit abe2a37e56
6 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/config_tools/board_config/board_cfg_gen.py
View File

@ -45,7 +45,8 @@ def main(args):
common.get_vm_types() common.get_vm_types()
if common.VM_COUNT > common.MAX_VM_NUM: if common.VM_COUNT > common.MAX_VM_NUM:
err_dic['vm count'] = "The vm count in config xml should be less or equal {}!".format(common.MAX_VM_NUM) err_dic['vm count'] = "The number of VMs in the scenario XML file should be no greater than " \
"hv.CAPACITIES.MAX_VM_NUM. Its current value is {}.".format(common.MAX_VM_NUM)
return err_dic return err_dic
# check if this is the scenario config which matched board info # check if this is the scenario config which matched board info

24
misc/config_tools/config_app/views.py
View File

@ -19,12 +19,12 @@ from flask import request, render_template, Blueprint, redirect, url_for, curren
# Refer to https://github.com/pallets/werkzeug/blob/master/LICENSE.rst for the permission notice. # Refer to https://github.com/pallets/werkzeug/blob/master/LICENSE.rst for the permission notice.
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
import common
from controller import * from controller import *
from scenario_config.scenario_cfg_gen import get_scenario_item_values from scenario_config.scenario_cfg_gen import get_scenario_item_values
from scenario_config.scenario_cfg_gen import validate_scenario_setting from scenario_config.scenario_cfg_gen import validate_scenario_setting
from launch_config.launch_cfg_gen import get_launch_item_values from launch_config.launch_cfg_gen import get_launch_item_values
from launch_config.launch_cfg_gen import validate_launch_setting from launch_config.launch_cfg_gen import validate_launch_setting
from library.common import MAX_VM_NUM
import scenario_config.default_populator as default_populator import scenario_config.default_populator as default_populator
@ -245,6 +245,7 @@ def save_scenario():
board_type = xml_configs[1] board_type = xml_configs[1]
scenario_config = xml_configs[3] scenario_config = xml_configs[3]
common.MAX_VM_NUM = int(scenario_config_data['hv,CAPACITIES,MAX_VM_NUM'])
if board_type is None or xml_configs[0] is None: if board_type is None or xml_configs[0] is None:
return {'status': 'fail', return {'status': 'fail',
'error_list': {'error': 'Please select the board info before this operation.'}} 'error_list': {'error': 'Please select the board info before this operation.'}}
@ -304,9 +305,9 @@ def save_scenario():
for vm in list(scenario_config.get_curr_root()): for vm in list(scenario_config.get_curr_root()):
if vm.tag == 'vm': if vm.tag == 'vm':
vm_list.append(vm.attrib['id']) vm_list.append(vm.attrib['id'])
if len(vm_list) >= MAX_VM_NUM: if len(vm_list) >= common.MAX_VM_NUM:
return {'status': 'fail', return {'status': 'fail',
'error_list': {'error': 'Can not add a new VM. Max VM number is {}.'.format(MAX_VM_NUM)}} 'error_list': {'error': 'Cannot add a new VM. hv.CAPACITIES.MAX_VM_NUM is currently set to {}.'.format(common.MAX_VM_NUM)}}
curr_vm_id = generator.split(':')[1] curr_vm_id = generator.split(':')[1]
add_vm_type = scenario_config_data['add_vm_type'] add_vm_type = scenario_config_data['add_vm_type']
add_scenario_config = get_generic_scenario_config(scenario_config, add_vm_type) add_scenario_config = get_generic_scenario_config(scenario_config, add_vm_type)
@ -320,7 +321,7 @@ def save_scenario():
curr_vm_index = i + 2 curr_vm_index = i + 2
break break
if add_scenario_config is not None and add_scenario_config.tag == 'vm': if add_scenario_config is not None and add_scenario_config.tag == 'vm':
for i in range(0, MAX_VM_NUM): for i in range(0, common.MAX_VM_NUM):
if str(i) not in vm_list: if str(i) not in vm_list:
break break
add_scenario_config.attrib['id'] = str(i) add_scenario_config.attrib['id'] = str(i)
@ -394,6 +395,8 @@ def save_launch():
scenario_file_path = os.path.join(current_app.config.get('CONFIG_PATH'), scenario_file_path = os.path.join(current_app.config.get('CONFIG_PATH'),
current_app.config.get('BOARD_TYPE'), current_app.config.get('BOARD_TYPE'),
scenario_name + '.xml') scenario_name + '.xml')
# update VM_COUNT and MAX_VM_NUM
common.get_vm_num(scenario_file_path)
for key in launch_config_data: for key in launch_config_data:
if launch_config_data[key] in [None, 'None']: if launch_config_data[key] in [None, 'None']:
@ -411,9 +414,14 @@ def save_launch():
for vm in list(launch_config.get_curr_root()): for vm in list(launch_config.get_curr_root()):
if vm.tag == 'user_vm': if vm.tag == 'user_vm':
vm_list.append(vm.attrib['id']) vm_list.append(vm.attrib['id'])
if len(vm_list) >= MAX_VM_NUM: if len(vm_list) >= common.MAX_VM_NUM:
return {'status': 'fail', return {
'error_list': {'error': 'Can not add a new VM. Max VM number is {}.'.format(MAX_VM_NUM)}} 'status': 'fail',
'error_list': {
'error': 'Cannot add a new VM. hv.CAPACITIES.MAX_VM_NUM '
'is currently set to {}.'.format(common.MAX_VM_NUM)
}
}
curr_vm_id = generator.split(':')[1].strip() curr_vm_id = generator.split(':')[1].strip()
add_launch_type = launch_config_data['add_launch_type'] add_launch_type = launch_config_data['add_launch_type']
if add_launch_type is None or len(add_launch_type.split('ID :')) < 2: if add_launch_type is None or len(add_launch_type.split('ID :')) < 2:
@ -440,7 +448,7 @@ def save_launch():
curr_vm_index = i + 1 curr_vm_index = i + 1
break break
if add_launch_config is not None and add_launch_config.tag == 'user_vm': if add_launch_config is not None and add_launch_config.tag == 'user_vm':
for i in range(1, MAX_VM_NUM): for i in range(1, common.MAX_VM_NUM):
if str(i) not in vm_list: if str(i) not in vm_list:
break break
add_launch_config.attrib['id'] = str(add_launch_id) add_launch_config.attrib['id'] = str(add_launch_id)

5
misc/config_tools/library/common.py
View File

@ -38,7 +38,7 @@ BOARD_INFO_FILE = ""
SCENARIO_INFO_FILE = "" SCENARIO_INFO_FILE = ""
LAUNCH_INFO_FILE = "" LAUNCH_INFO_FILE = ""
VM_TYPES = {} VM_TYPES = {}
MAX_VM_NUM = 32 MAX_VM_NUM = 16
MAX_VUART_NUM = 8 MAX_VUART_NUM = 8
@ -291,7 +291,7 @@ def get_vm_num(config_file):
:param config_file: it is a file what contains information for script to read from :param config_file: it is a file what contains information for script to read from
:return: total vm number :return: total vm number
""" """
global VM_COUNT global VM_COUNT, MAX_VM_NUM
vm_count = 0 vm_count = 0
root = get_config_root(config_file) root = get_config_root(config_file)
for item in root: for item in root:
@ -299,6 +299,7 @@ def get_vm_num(config_file):
if item.tag == "vm": if item.tag == "vm":
vm_count += 1 vm_count += 1
VM_COUNT = vm_count VM_COUNT = vm_count
MAX_VM_NUM = int(root.find(".//MAX_VM_NUM").text)
def get_leaf_value(tmp, tag_str, leaf): def get_leaf_value(tmp, tag_str, leaf):

3
misc/config_tools/scenario_config/scenario_cfg_gen.py
View File

@ -217,7 +217,8 @@ def main(args):
return err_dic return err_dic
if common.VM_COUNT > common.MAX_VM_NUM: if common.VM_COUNT > common.MAX_VM_NUM:
err_dic['vm count'] = "Number of VMs in scenario xml file should be no greater than {}!".format(common.MAX_VM_NUM) err_dic['vm count'] = "Number of VMs in scenario xml file should be no greater than hv/CAPACITIES/MAX_VM_NUM ! " \
"Now this value is {}.".format(common.MAX_VM_NUM)
return err_dic return err_dic
# check if this is the scenario config which matches board info # check if this is the scenario config which matches board info

5
misc/config_tools/schema/config.xsd
View File

@ -222,6 +222,11 @@ value ``0x400000000``.</xs:documentation>
maximum supported resource.</xs:documentation> maximum supported resource.</xs:documentation>
</xs:annotation> </xs:annotation>
<xs:all> <xs:all>
<xs:element name="MAX_VM_NUM" type="xs:integer" default="16">
<xs:annotation>
<xs:documentation>Maximum number of User VMs allowed.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="IOMMU_BUS_NUM" type="HexFormat" default="0x100"> <xs:element name="IOMMU_BUS_NUM" type="HexFormat" default="0x100">
<xs:annotation> <xs:annotation>
<xs:documentation>Highest PCI bus ID used during IOMMU <xs:documentation>Highest PCI bus ID used during IOMMU

3
misc/config_tools/xforms/vm_configurations.h.xsl
View File

@ -41,7 +41,8 @@
<xsl:value-of select="$newline" /> <xsl:value-of select="$newline" />
<xsl:value-of select="acrn:define('PRE_VM_NUM', count(vm[acrn:is-pre-launched-vm(vm_type)]), 'U')" /> <xsl:value-of select="acrn:define('PRE_VM_NUM', count(vm[acrn:is-pre-launched-vm(vm_type)]), 'U')" />
<xsl:value-of select="acrn:define('SERVICE_VM_NUM', count(vm[acrn:is-sos-vm(vm_type)]), 'U')" /> <xsl:value-of select="acrn:define('SERVICE_VM_NUM', count(vm[acrn:is-sos-vm(vm_type)]), 'U')" />
<xsl:value-of select="acrn:define('MAX_POST_VM_NUM', count(vm[acrn:is-post-launched-vm(vm_type)]), 'U')" /> <xsl:value-of select="acrn:define('MAX_POST_VM_NUM', hv/CAPACITIES/MAX_VM_NUM - count(vm[acrn:is-pre-launched-vm(vm_type)]) - count(vm[acrn:is-sos-vm(vm_type)]) , 'U')" />
<xsl:value-of select="acrn:define('CONFIG_MAX_VM_NUM', hv/CAPACITIES/MAX_VM_NUM , 'U')" />
</xsl:template> </xsl:template>
<xsl:template name ="dm_guest_flag"> <xsl:template name ="dm_guest_flag">