OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

config_tools: using XPATH expression to handle input data 

XPATH 2.0 already supports functions like for-expressions,
so we use XPATH expression instead of the python code to format
virtio input data.

Tracked-On: #6691
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Kunhui-Li 2022-05-17 23:50:06 +08:00 committed by acrnsi-robot
parent 859f6b803c
commit 5c72036a67
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc/config_tools/configurator/pyodide/loadBoard.py
View File

@ -2,7 +2,6 @@
__package__ = 'configurator.pyodide' __package__ = 'configurator.pyodide'
import json import json
import logging
from copy import deepcopy from copy import deepcopy
import elementpath import elementpath
@ -21,11 +20,7 @@ def get_dynamic_scenario(board):
board_xml = etree.fromstring(board) board_xml = etree.fromstring(board)
def get_enum(source, options, obj_type): def get_enum(source, options, obj_type):
if options == "//inputs/input": elements = [str(x) for x in elementpath.select(source, options) if x]
inputs_etree = [x for x in elementpath.select(source, options) if x is not None]
elements = [f"Device name: {str(elementpath.select(i, './name/text()')[0])}, Device physical path: {str(elementpath.select(i, './phys/text()')[0])}" for i in inputs_etree]
else:
elements = [str(x) for x in elementpath.select(source, options) if x]
elements = list(set(elements)) elements = list(set(elements))
if not elements: if not elements:
elements = [''] elements = ['']
@ -47,10 +42,7 @@ def get_dynamic_scenario(board):
# get enum data # get enum data
enum = function(source, selector, obj_type) enum = function(source, selector, obj_type)
if sorted_func: if sorted_func:
try: enum = sorted(enum, key=eval(sorted_func))
enum = sorted(enum, key=eval(sorted_func))
except IndexError as e:
logging.warning(e)
return enum return enum
def dynamic_enum_apply(obj): def dynamic_enum_apply(obj):

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

@ -395,8 +395,9 @@ device file when user config it as virtio serial port, which can be read and wri
<xs:complexType name="VirtioInputConfiguration"> <xs:complexType name="VirtioInputConfiguration">
<xs:sequence> <xs:sequence>
<xs:element name="backend_device_file" type="xs:string" minOccurs="0"> <xs:element name="backend_device_file" type="xs:string" minOccurs="0">
<xs:annotation acrn:title="Backend device file" acrn:widget-options="'placeholder': '/dev/input/eventX'" acrn:options="//inputs/input" <xs:annotation acrn:title="Backend device file" acrn:widget-options="'placeholder': '/dev/input/eventX'"
acrn:options-sorted-by="lambda s: (s.split('Device name: ')[1].split(', Device physical path')[0], s.split('Device physical path: ')[1])"> acrn:options="for $input in //inputs/input return concat('Device name: ', $input/name/text(), ', Device physical path: ', $input/phys/text())"
acrn:options-sorted-by="lambda s: s">
<xs:documentation>Specifying backend device in service vm with device description.</xs:documentation> <xs:documentation>Specifying backend device in service vm with device description.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:element> </xs:element>