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

config_tools: update the upgrader.py script for virtio devices

Browse Source 
We have redesigned Virtio devices, so this patch updates
the upgrader.py script for them.

Tracked-On: #6690
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-04-06 16:08:49 +08:00 committed by acrnsi-robot
parent 2ce914428c
commit e56c0372f0
14 changed files with 312 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
View File

@ -148,7 +148,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -173,8 +176,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>

55
misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
View File

@ -102,7 +102,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -130,8 +133,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>RT</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>
@ -158,8 +167,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG3</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG3</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -186,8 +201,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG4</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG4</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -214,8 +235,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG5</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG5</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -242,8 +269,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG6</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG6</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>

15
misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
View File

@ -148,7 +148,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -173,8 +176,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>

55
misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
View File

@ -110,7 +110,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -138,8 +141,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>RT</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>
@ -166,8 +175,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG3</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG3</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -194,8 +209,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG4</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG4</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -222,8 +243,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG5</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG5</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -250,8 +277,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG6</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG6</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>

15
misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
View File

@ -148,7 +148,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -173,8 +176,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>

55
misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
View File

@ -122,7 +122,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -150,8 +153,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>RT</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>
@ -178,8 +187,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG3</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG3</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -206,8 +221,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG4</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG4</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -234,8 +255,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG5</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG5</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
@ -262,8 +289,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>YaaG6</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>YaaG6</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>

20
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
View File

@ -123,8 +123,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>WaaG</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -153,8 +159,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>RT</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>

5
misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
View File

@ -164,7 +164,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>

10
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
View File

@ -113,8 +113,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>RT</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>

5
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
View File

@ -99,7 +99,10 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network/>
<input/>
<block>./VxWorks.img</block>

5
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
View File

@ -103,7 +103,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>

15
misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
View File

@ -103,7 +103,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -131,8 +134,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>RT</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>

15
misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
View File

@ -103,7 +103,10 @@
<usb_xhci/>
<virtio_devices>
<console/>
<network>WaaG</network>
<network>
<virtio_framework/>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
@ -131,8 +134,14 @@
<vuart0>Disable</vuart0>
<usb_xhci/>
<virtio_devices>
<console>@stdio:stdio_port</console>
<network>RT</network>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<virtio_framework/>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>

85
misc/config_tools/scenario_config/upgrader.py
View File

@ -232,6 +232,73 @@ class SharedMemoryRegions:
node.append(region.format_xml_element())
return node
class VirtioDevices(object):
def __init__(self, old_xml_etree):
self.blocks = []
self.inputs = []
self.networks = []
self.console = namedtuple("console", ["use_type", "backend_type", "file_path"])
self.old_xml_etree = old_xml_etree
def console_encoding(self, text):
if text is not None:
self.console.use_type = "Virtio console" if text.startswith("@") else "Virtio serial port"
self.console.backend_type = text.split(":")[0].replace("@", "")
self.console.file_path = text.split("=")[1].split(":")[0] if "=" in text else None
else:
self.console = self.console(use_type=None, backend_type=None, file_path=None)
return self.console
def format_console_element(self):
node = etree.Element("console")
etree.SubElement(node, "use_type").text = self.console.use_type
etree.SubElement(node, "backend_type").text = self.console.backend_type
if self.console.backend_type == "socket":
etree.SubElement(node, "sock_file_path").text = self.console.file_path
if self.console.backend_type == "tty":
etree.SubElement(node, "tty_device_path").text = self.console.file_path
if self.console.backend_type == "file":
etree.SubElement(node, "output_file_path").text = self.console.file_path
return node
def format_network_element(self, network):
node = etree.Element("network")
etree.SubElement(node, "virtio_framework")
etree.SubElement(node, "interface_name").text = network
return node
def format_input_element(self, input):
node = etree.Element("input")
etree.SubElement(node, "backend_device_file").text = input
etree.SubElement(node, "id")
return node
def format_block_element(self, block):
node = etree.Element("block")
node.text = block
return node
def format_xml_element(self):
node = etree.Element("virtio_devices")
node.append(self.format_console_element())
for network in self.networks:
node.append(self.format_network_element(network))
for input in self.inputs:
node.append(self.format_input_element(input))
for block in self.blocks:
node.append(self.format_block_element(block))
return node
def add_virtio_devices(self, virtio_device_node):
self.console = self.console_encoding(virtio_device_node.xpath("./console")[0].text)
for virtio_network in virtio_device_node.xpath("./network"):
self.networks.append(virtio_network.text)
for virtio_input in virtio_device_node.xpath("./input"):
self.inputs.append(virtio_input.text)
for virtio_block in virtio_device_node.xpath("./block"):
self.blocks.append(virtio_block.text)
class ScenarioUpgrader(ScenarioTransformer):
@classmethod
def get_node(cls, element, xpath):
@ -295,6 +362,22 @@ class ScenarioUpgrader(ScenarioTransformer):
self.move_data_by_xpath(".//BUILD_TYPE", xsd_element_node, xml_parent_node, new_nodes)
return False
def move_virtio_devices(self, xsd_element_node, xml_parent_node, new_nodes):
virtio = VirtioDevices(self.old_xml_etree)
try:
old_data_virtio = self.get_from_old_data(xml_parent_node, ".//virtio_devices").pop()
except IndexError as e:
logging.debug(e)
return
old_data_virtio = self.get_from_old_data(xml_parent_node, ".//virtio_devices").pop()
virtio.add_virtio_devices(old_data_virtio)
for child in old_data_virtio.iter():
self.old_data_nodes.discard(child)
new_nodes.append(virtio.format_xml_element())
return False
def move_console_vuart(self, xsd_element_node, xml_parent_node, new_nodes):
new_node = etree.Element(xsd_element_node.get("name"))
new_node.text = "None"
@ -554,7 +637,6 @@ class ScenarioUpgrader(ScenarioTransformer):
"console_vuart/base": partialmethod(move_data_by_xpath, ".//console_vuart/base"),
"epc_section/size": partialmethod(move_data_by_xpath, ".//epc_section/size"),
"memory/size": partialmethod(move_data_by_xpath, ".//memory/size"),
"virtio_devices/network": partialmethod(move_data_by_xpath, ".//virtio_devices/network"),
# Guest flags
"lapic_passthrough": move_lapic_passthrough,
@ -579,6 +661,7 @@ class ScenarioUpgrader(ScenarioTransformer):
"IVSHMEM": move_ivshmem,
"vm_type": move_vm_type,
"os_type": move_os_type,
"virtio_devices": move_virtio_devices,
"memory/whole": partialmethod(rename_data, "memory/whole", ".//mem_size"),
"default": move_data_by_same_tag,