From c4d59c8f9197bf17359c6b9527fd180e2d5ab26e Mon Sep 17 00:00:00 2001
From: Jie Deng <jie.deng@intel.com>
Date: Fri, 12 Nov 2021 09:45:05 +0800
Subject: [PATCH] hv: tee: Support the concept of companion VM

Add a configuration to support companion VM.

Tracked-On: #6571
Signed-off-by: Jie Deng <jie.deng@intel.com>
Reviewed-by: Wang, Yu1 <yu1.wang@intel.com>
---
 hypervisor/include/arch/x86/asm/vm_config.h      | 1 +
 misc/config_tools/schema/config.xsd              | 5 +++++
 misc/config_tools/xforms/vm_configurations.c.xsl | 1 +
 3 files changed, 7 insertions(+)

diff --git a/hypervisor/include/arch/x86/asm/vm_config.h b/hypervisor/include/arch/x86/asm/vm_config.h
index edd1a1019..51f216e58 100644
--- a/hypervisor/include/arch/x86/asm/vm_config.h
+++ b/hypervisor/include/arch/x86/asm/vm_config.h
@@ -156,6 +156,7 @@ struct acrn_vm_config {
 							 * We could add more guest flags in future;
 							 */
 	uint32_t vm_prio;				/* The priority for VM vCPU scheduling */
+	uint16_t companion_vm_id;			/* The companion VM id for this VM */
 	struct acrn_vm_mem_config memory;		/* memory configuration of VM */
 	struct epc_section epc;				/* EPC memory configuration of VM */
 	uint16_t pci_dev_num;				/* indicate how many PCI devices in VM */
diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd
index b83222109..710db5118 100644
--- a/misc/config_tools/schema/config.xsd
+++ b/misc/config_tools/schema/config.xsd
@@ -396,6 +396,11 @@ Refer SDM 17.19.2 for details, and use with caution.</xs:documentation>
         <xs:documentation>Specify the VM vCPU priority for scheduling.</xs:documentation>
       </xs:annotation>
     </xs:element>
+    <xs:element name="companion_vmid" type="xs:integer" default="65535">
+      <xs:annotation>
+        <xs:documentation>Specify the companion VM id of this VM.</xs:documentation>
+      </xs:annotation>
+    </xs:element>
     <xs:element name="os_config" type="OSConfigurations" minOccurs="0">
       <xs:annotation>
         <xs:documentation>General information for host kernel, boot
diff --git a/misc/config_tools/xforms/vm_configurations.c.xsl b/misc/config_tools/xforms/vm_configurations.c.xsl
index 45349dd5c..d2a17d3e8 100644
--- a/misc/config_tools/xforms/vm_configurations.c.xsl
+++ b/misc/config_tools/xforms/vm_configurations.c.xsl
@@ -88,6 +88,7 @@
       <xsl:value-of select="$newline" />
     </xsl:if>
     <xsl:value-of select="acrn:initializer('vm_prio', priority)" />
+    <xsl:value-of select="acrn:initializer('companion_vm_id', concat(companion_vmid, 'U'))" />
     <xsl:apply-templates select="guest_flags" />
 
     <xsl:if test="acrn:is-rdt-enabled()">