From 2c2ccfc52c69383d8f21f0f6e689be6064956948 Mon Sep 17 00:00:00 2001
From: Wei Liu <weix.w.liu@intel.com>
Date: Fri, 29 Nov 2019 12:02:48 +0800
Subject: [PATCH] acrn-config: support OVMF vbootloader only

In current implementation, we only support OVMF as vbootloader, so
set vbootloader attributes to readonly in related XMLs to avoid issues.

Tracked-On: #3854

Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
---
 .../xmls/config-xmls/generic/hybrid_launch_1uos.xml           | 2 +-
 .../xmls/config-xmls/generic/industry_launch_1uos.xml         | 2 +-
 .../xmls/config-xmls/generic/industry_launch_2uos.xml         | 4 ++--
 misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml | 2 +-
 .../xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml   | 2 +-
 .../xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml        | 4 ++--
 .../xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml  | 2 +-
 .../xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml       | 4 ++--
 .../xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml | 2 +-
 .../xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml      | 4 ++--
 .../xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml | 2 +-
 .../xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml      | 4 ++--
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml
index f4efae7d7..ff8b5f476 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability"></rtos_type>
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc=""></vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc=""></rootfs_dev>
 	<rootfs_img desc=""></rootfs_img>
 	<console_type desc="UOS console type"></console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml
index f60a20186..87010cd1e 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability"></rtos_type>
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc=""></vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc=""></rootfs_dev>
 	<rootfs_img desc=""></rootfs_img>
 	<console_type desc="UOS console type"></console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml
index dba1e9f33..bd6361ae6 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability"></rtos_type>
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc=""></vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc=""></rootfs_dev>
 	<rootfs_img desc=""></rootfs_img>
 	<console_type desc="UOS console type"></console_type>
@@ -36,7 +36,7 @@
 	<rtos_type desc="UOS Realtime capability"></rtos_type>
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc=""></vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc=""></rootfs_dev>
 	<rootfs_img desc=""></rootfs_img>
 	<console_type desc="UOS console type"></console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml
index d16ea7d2d..d7ab2827f 100644
--- a/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability"></rtos_type>
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc=""></vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc=""></rootfs_dev>
 	<rootfs_img desc=""></rootfs_img>
 	<console_type desc="UOS console type"></console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml
index 7234eac36..3b3f04ec2 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml
index 98234d986..cd5ad9c86 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
@@ -35,7 +35,7 @@
 	<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
 	<mem_size desc="UOS memory size in MByte">1024</mem_size>
 	<gvt_args configurable="0" desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc="" readonly="true">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev configurable="0" desc=""></rootfs_dev>
 	<rootfs_img configurable="0" desc=""></rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml
index af0e0e29e..60a896a25 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml
index af533a170..ae4c1f5f9 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
@@ -35,7 +35,7 @@
 	<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
 	<mem_size desc="UOS memory size in MByte">1024</mem_size>
 	<gvt_args configurable="0" desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc="" readonly="true">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev configurable="0" desc=""></rootfs_dev>
 	<rootfs_img configurable="0" desc=""></rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml
index d7b0ed699..e3fa1ac1f 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml
index 3d9a296bd..6d83d4fd2 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
@@ -35,7 +35,7 @@
 	<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
 	<mem_size desc="UOS memory size in MByte">1024</mem_size>
 	<gvt_args configurable="0" desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc="" readonly="true">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev configurable="0" desc=""></rootfs_dev>
 	<rootfs_img configurable="0" desc=""></rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml
index 1b42fcc42..9414fa9d9 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml
index 372b7058a..a1bf12ce7 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml
@@ -4,7 +4,7 @@
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
-	<vbootloader desc="virtual bootloader method">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/sda3</rootfs_dev>
 	<rootfs_img desc="rootfs image" readonly="true">./win10-ltsc.img</rootfs_img>
 	<console_type desc="UOS console type">com1(ttyS0)</console_type>
@@ -35,7 +35,7 @@
 	<rtos_type desc="UOS Realtime capability">Hard RT</rtos_type>
 	<mem_size desc="UOS memory size in MByte">1024</mem_size>
 	<gvt_args configurable="0" desc="GVT argument for the vm"></gvt_args>
-	<vbootloader desc="" readonly="true">ovmf</vbootloader>
+	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
 	<rootfs_dev configurable="0" desc=""></rootfs_dev>
 	<rootfs_img configurable="0" desc=""></rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>