github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-08 08:26:55 +00:00
Code Issues Projects Releases Wiki Activity

config-tools: fix vBDF issue for IVSHMEM

Browse Source 
1. Fix the issue that when saving the configuration, the vBDF does not
display automatically in IVSHMEM region.
2. Chagne 'Region name' in IVSHMEM from optional to required.
3. Fix the wrong tooltip content for 'VM name'.

Tracked-On: #7673
Signed-off-by: Conghui <conghui.chen@intel.com>
This commit is contained in:
Conghui 2022-06-02 12:18:29 +08:00 committed by acrnsi-robot
parent 8759743857
commit eeeddfed14
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/IVSHMEM_REGION.vue
View File

@ -6,12 +6,14 @@
<b-row class="align-items-center my-2 mt-4"> <b-row class="align-items-center my-2 mt-4">
<b-col md="2"> <b-col md="2">
<n-popover trigger="hover" placement="top-start"> <label>
<n-popover trigger="hover" placement="top-start">
<template #trigger> <template #trigger>
<IconInfo/> <IconInfo/>
</template> </template>
<span v-html="this.IVSHMEMRegionType.properties.NAME.description"></span> <span v-html="this.IVSHMEMRegionType.properties.NAME.description"></span>
</n-popover>Region name: </n-popover>Region name:
</label>
</b-col> </b-col>
<b-col md="4"> <b-col md="4">
<b-form-input v-model="IVSHMEM_VMO.NAME" placeholder="Any string with no white spaces."/> <b-form-input v-model="IVSHMEM_VMO.NAME" placeholder="Any string with no white spaces."/>
@ -59,7 +61,7 @@
<template #trigger> <template #trigger>
<IconInfo/> <IconInfo/>
</template> </template>
<span v-html="this.IVSHMEMVM.properties.VBDF.description"></span> <span v-html="this.IVSHMEM_VM.properties.VBDF.description"></span>
</n-popover>Virtual BDF: </n-popover>Virtual BDF:
</b-col> </b-col>
</b-row> </b-row>
@ -71,7 +73,7 @@
<template #trigger> <template #trigger>
<IconInfo/> <IconInfo/>
</template> </template>
<span v-html="this.VMConfigType.properties.name.description"></span> <span v-html="this.IVSHMEM_VM.properties.VM_NAME.description"></span>
</n-popover>VM name: </n-popover>VM name:
</label> </label>
</b-col> </b-col>
@ -82,7 +84,7 @@
</b-form-invalid-feedback> </b-form-invalid-feedback>
</b-col> </b-col>
<b-col sm="3"> <b-col sm="3">
<b-form-input :v-model="IVSHMEM_VM.VBDF" placeholder="00:[device].[function], e.g. 00:0c.0. All fields are in hexadecimal."/> <b-form-input v-model="IVSHMEM_VM.VBDF" placeholder="00:[device].[function], e.g. 00:0c.0. All fields are in hexadecimal."/>
<b-form-invalid-feedback> <b-form-invalid-feedback>
must have value must have value
</b-form-invalid-feedback> </b-form-invalid-feedback>
@ -165,8 +167,7 @@ export default {
providerType: this.rootSchema.definitions['ProviderType']['enum'], providerType: this.rootSchema.definitions['ProviderType']['enum'],
IVSHMEMSize: this.rootSchema.definitions['IVSHMEMSize']['enum'], IVSHMEMSize: this.rootSchema.definitions['IVSHMEMSize']['enum'],
IVSHMEMRegionType: this.rootSchema.definitions['IVSHMEMRegionType'], IVSHMEMRegionType: this.rootSchema.definitions['IVSHMEMRegionType'],
IVSHMEMVM: this.rootSchema.definitions['IVSHMEMVM'], IVSHMEM_VM: this.rootSchema.definitions['IVSHMEMVM'],
VMConfigType: this.rootSchema.definitions['VMConfigType'],
defaultVal: vueUtils.getPathVal(this.rootFormData, this.curNodePath) defaultVal: vueUtils.getPathVal(this.rootFormData, this.curNodePath)
}; };
}, },

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

@ -243,7 +243,7 @@ Read more about the available scheduling options in :ref:`cpu_sharing`.</xs:docu
<xs:complexType name="IVSHMEMRegionType"> <xs:complexType name="IVSHMEMRegionType">
<xs:all> <xs:all>
<xs:element name="NAME"> <xs:element name="NAME" minOccurs="1">
<xs:annotation acrn:title="Region Name"> <xs:annotation acrn:title="Region Name">
<xs:documentation>Name of the shared memory region.</xs:documentation> <xs:documentation>Name of the shared memory region.</xs:documentation>
</xs:annotation> </xs:annotation>