github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-10-31 01:09:28 +00:00
Code Issues Projects Releases Wiki Activity

config-tools: add vsock option in configurator

Browse Source 
vsock is the new socket address family for host/guest communication.
Configurator option for vsock CID is added in this patch.
Also vsock parameter is generated in script.

Tracked-On: #7535
Signed-off-by: Wu Zhou <wu.zhou@intel.com>
This commit is contained in:
Wu Zhou
2022-05-23 11:32:28 +08:00
committed by acrnsi-robot
parent 8e263385c5
commit 59ec4cf6c2
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
misc/config_tools/launch_config/launch_cfg_gen.py
View File

@@ -326,6 +326,9 @@ def generate_for_one_vm(board_etree, hv_scenario_etree, vm_scenario_etree, vm_id
if virtio_gpu is not None: if virtio_gpu is not None:
script.add_virtual_device("virtio-gpu", options=virtio_gpu) script.add_virtual_device("virtio-gpu", options=virtio_gpu)
for vsock in eval_xpath_all(vm_scenario_etree, ".//virtio_devices/vsock[text() != '']/text()"):
script.add_virtual_device("vhost-vsock", options="cid="+vsock)
# Passthrough PCI devices # Passthrough PCI devices
bdf_regex = re.compile("([0-9a-f]{2}):([0-1][0-9a-f]).([0-7])") bdf_regex = re.compile("([0-9a-f]{2}):([0-1][0-9a-f]).([0-7])")
for passthru_device in eval_xpath_all(vm_scenario_etree, ".//pci_devs/*/text()"): for passthru_device in eval_xpath_all(vm_scenario_etree, ".//pci_devs/*/text()"):

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

@@ -445,6 +445,22 @@ argument and memory.</xs:documentation>
This feature enables you to view the VM's GPU output in the Service VM.</xs:documentation> This feature enables you to view the VM's GPU output in the Service VM.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:element> </xs:element>
<xs:element name="vsock" minOccurs="0">
<xs:annotation acrn:title="Virtio vsock CID" acrn:views="basic"
acrn:widget-options="'placeholder': '3 ~ (-2U)'">
<xs:documentation>vsock is the new socket address family for host/guest communication.
CID is the identifier for this VM.</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:integer">
<xs:annotation>
<xs:documentation>Integer between 3 ~ (-2U).</xs:documentation>
</xs:annotation>
<xs:minInclusive value="3" />
<xs:maxInclusive value="4294967294" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="console" type="VirtioConsoleConfiguration" minOccurs="0" maxOccurs="unbounded"> <xs:element name="console" type="VirtioConsoleConfiguration" minOccurs="0" maxOccurs="unbounded">
<xs:annotation acrn:title="Virtio console device" acrn:views="basic"> <xs:annotation acrn:title="Virtio console device" acrn:views="basic">
<xs:documentation>Virtio console device for data input and output. <xs:documentation>Virtio console device for data input and output.