From 3953a2136a0b7935876b4a72f09b506c4fba4aa1 Mon Sep 17 00:00:00 2001
From: Wei Liu <weix.w.liu@intel.com>
Date: Sat, 25 Jul 2020 10:34:28 +0800
Subject: [PATCH] acrn-config: update launch 1 uos script for tgl-rvp

Update launch 1 uos script for tgl-rvp.

Tracked-On: #5091
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
---
 .../tgl-rvp/industry_launch_1uos.xml          | 32 ----------------
 .../tgl-rvp/industry_launch_1uos_waag.xml     | 37 +++++++++++++++++++
 2 files changed, 37 insertions(+), 32 deletions(-)
 delete mode 100644 misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml
 create mode 100644 misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml

diff --git a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml
deleted file mode 100644
index d104bcc0b..000000000
--- a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<acrn-config board="tgl-rvp" scenario="industry" uos_launcher="1">
-    <uos id="1">
-        <uos_type desc="UOS type">YOCTO</uos_type>
-        <rtos_type desc="UOS Realtime capability">no</rtos_type>
-        <mem_size desc="UOS memory size in MByte">2000</mem_size>
-        <gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
-        <vbootloader desc="">ovmf</vbootloader>
-        <rootfs_dev desc="">/dev/nvme0n1p3</rootfs_dev>
-        <rootfs_img desc="">/root/uos/uos.img</rootfs_img>
-        <console_type desc="UOS console type">com1(ttyS0)</console_type>
-        <poweroff_channel desc="the method of power off uos">	</poweroff_channel>
-        <usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
-        <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
-                <pcpu_id></pcpu_id>
-        </cpu_affinity>
-        <passthrough_devices>
-            <usb_xdci desc="vm usb_xdci device" />
-            <audio desc="vm audio device" />
-            <audio_codec desc="vm audio codec device" />
-            <ipu desc="vm ipu device" />
-            <ipu_i2c desc="vm ipu_i2c device" />
-            <cse desc="vm cse device" />
-            <wifi desc="vm wifi device" />
-            <bluetooth desc="vm bluetooth" />
-            <sd_card desc="vm sd card device" />
-            <ethernet desc="vm ethernet device" />
-            <sata desc="vm sata device" />
-            <nvme desc="vm nvme device" />
-        </passthrough_devices>
-    </uos>
-</acrn-config>
diff --git a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml
new file mode 100644
index 000000000..e2eb11dae
--- /dev/null
+++ b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml
@@ -0,0 +1,37 @@
+<acrn-config board="tgl-rvp" scenario="industry" uos_launcher="1">
+    <uos id="1">
+	<uos_type desc="UOS type">WINDOWS</uos_type>
+	<rtos_type desc="UOS Realtime capability">no</rtos_type>
+	<mem_size desc="UOS memory size in MByte">4096</mem_size>
+	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
+	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
+	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
+	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+		<pcpu_id></pcpu_id>
+	</cpu_affinity>
+
+	<passthrough_devices>
+		<usb_xdci desc="vm usb_xdci device"></usb_xdci>
+		<audio desc="vm audio device">00:1f.3 Multimedia audio controller: Intel Corporation Device a0c8 (rev 10)</audio>
+		<audio_codec desc="vm audio codec device"></audio_codec>
+		<ipu desc="vm ipu device"></ipu>
+		<ipu_i2c desc="vm ipu_i2c device"></ipu_i2c>
+		<cse desc="vm cse device"></cse>
+		<wifi desc="vm wifi device"></wifi>
+		<bluetooth desc="vm bluetooth"></bluetooth>
+		<sd_card desc="vm sd card device"></sd_card>
+		<ethernet desc="vm ethernet device"></ethernet>
+		<sata desc="vm sata device"></sata>
+		<nvme desc="vm nvme device"></nvme>
+	</passthrough_devices>
+
+	<virtio_devices>
+		<network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">WaaG</network>
+		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./win10-ltsc.img</block>
+		<console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]"></console>
+	</virtio_devices>
+    </uos>
+</acrn-config>