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

config-tools: refine the vuart widget's text

Browse Source 
The labels and titles in vuart widget are hard-coded in the .vue file
rather than exposing the text from XSD file. This patch fixed it.

Tracked-On: #7562

Signed-off-by: Wu Zhou <wu.zhou@intel.com>
This commit is contained in:
Wu Zhou 2022-05-25 18:54:27 +08:00 committed by acrnsi-robot
parent 7c17700dfb
commit 15753e5e63
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/VUART.vue
View File

@ -12,7 +12,7 @@
<IconInfo/> <IconInfo/>
</template> </template>
<span v-html="this.VMConfigType.properties.name.description"></span> <span v-html="this.VMConfigType.properties.name.description"></span>
</n-popover>VM name: </n-popover>{{vmNameTitle}}
</label> </label>
</b-col> </b-col>
<b-col md="4"> <b-col md="4">
@ -37,7 +37,7 @@
<IconInfo/> <IconInfo/>
</template> </template>
<span v-html="this.VMConfigType.properties.name.description"></span> <span v-html="this.VMConfigType.properties.name.description"></span>
</n-popover>VM name: </n-popover>{{vmNameTitle}}:
</label> </label>
</b-col> </b-col>
<b-col md="4"> <b-col md="4">
@ -56,7 +56,7 @@
<IconInfo/> <IconInfo/>
</template> </template>
<span v-html="this.VuartConnectionType.properties.type.description"></span> <span v-html="this.VuartConnectionType.properties.type.description"></span>
</n-popover>Type: </n-popover>{{vuartConnectionTypeTitle}}:
</label> </label>
</b-col> </b-col>
<b-col md="4"> <b-col md="4">
@ -81,7 +81,7 @@
</template> </template>
<span v-html="this.VuartEndpointType.io_port.description"></span> <span v-html="this.VuartEndpointType.io_port.description"></span>
</n-popover> </n-popover>
I/O address: {{vuartVIoPortTitle}}:
</b-col> </b-col>
<b-col sm="4" v-else-if="VUARTConn.type === 'pci'"> <b-col sm="4" v-else-if="VUARTConn.type === 'pci'">
<n-popover trigger="hover" placement="top-start"> <n-popover trigger="hover" placement="top-start">
@ -89,7 +89,7 @@
<IconInfo/> <IconInfo/>
</template> </template>
<span>{{this.VuartEndpointType.vbdf.description}}</span> <span>{{this.VuartEndpointType.vbdf.description}}</span>
</n-popover>VBDF </n-popover>{{vuartVBDFTitle}}
</b-col> </b-col>
</b-row> </b-row>
<b-row class="justify-content-sm-start align-items-center"> <b-row class="justify-content-sm-start align-items-center">
@ -174,8 +174,15 @@ export default {
let epTypeProp = this.rootSchema.definitions.VuartEndpointType.properties let epTypeProp = this.rootSchema.definitions.VuartEndpointType.properties
let conTypeProp = this.rootSchema.definitions.VuartConnectionType.properties let conTypeProp = this.rootSchema.definitions.VuartConnectionType.properties
return { return {
VuartType: this.rootSchema.definitions['VuartType']['enum'],
VuartEndpointType: this.rootSchema.definitions['VuartEndpointType']['properties'], VuartEndpointType: this.rootSchema.definitions['VuartEndpointType']['properties'],
vmNameTitle: epTypeProp.vm_name.title,
vuartConnectionTypeTitle: conTypeProp.type.title,
vuartEndpointTitle: conTypeProp.endpoint['title'],
vuartVIoPortTitle: epTypeProp.io_port.title,
vuartVBDFTitle: epTypeProp.vbdf.title,
vIoPortPlaceholder: epTypeProp.io_port['ui:options']['placeholder'],
vBDFPlaceholder: epTypeProp.vbdf['ui:options']['placeholder'],
VuartType,
IOPortDefault: this.rootSchema.definitions['VuartEndpointType']['properties']['io_port']['default'], IOPortDefault: this.rootSchema.definitions['VuartEndpointType']['properties']['io_port']['default'],
VMConfigType: this.rootSchema.definitions['VMConfigType'], VMConfigType: this.rootSchema.definitions['VMConfigType'],
VuartConnectionType: this.rootSchema.definitions['VuartConnectionType'], VuartConnectionType: this.rootSchema.definitions['VuartConnectionType'],

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

@ -216,7 +216,7 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
</xs:annotation> </xs:annotation>
</xs:element> </xs:element>
<xs:element name="io_port" type="HexFormat"> <xs:element name="io_port" type="HexFormat">
<xs:annotation acrn:title="Virtual I/O address" acrn:defaults="[hex(i) for i in range(0x9200, 0x9280, 8)]" acrn:unique-among="//vuart_connection/endpoint[vm_name=$parent/vm_name]/io_port/text()"> <xs:annotation acrn:title="Virtual I/O address" acrn:defaults="[hex(i) for i in range(0x9200, 0x9280, 8)]" acrn:unique-among="//vuart_connection/endpoint[vm_name=$parent/vm_name]/io_port/text()" acrn:widget-options="'placeholder':'An address in hexadecimal, e.g. 0x4000'">
<xs:documentation>Specify the COM base for each legacy virtual UART.</xs:documentation> <xs:documentation>Specify the COM base for each legacy virtual UART.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:element> </xs:element>