acrn-config: add rootfs_dev/rootfs_img with virtio-blk item

remov rootfs_dev and rootfs_img item and replace them with vritio-blk
item.

The format for virtio-blk:
[blk partition:][img path] e.g.: /dev/sda3:./a/b.img

For vbootloader of ovmf: [img path] e.g.:./a/b.img

Tracked-On: #4172
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>

Author: Wei Liu

misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte">2048</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/mmcblk1p3</rootfs_dev>
-	<rootfs_img desc="rootfs image" readonly="true">android/android.img</rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
 	<poweroff_channel desc="the method of power off uos" readonly="true">
 	--pm_notify_channel ioc \
@@ -30,6 +28,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">/dev/mmcblk1p3:android/android.img</block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte">2048</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/mmcblk1p3</rootfs_dev>
-	<rootfs_img desc="rootfs image" readonly="true">alios/alios.img</rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
 	<poweroff_channel desc="the method of power off uos" readonly="true">
 	--pm_notify_channel ioc \
@@ -30,6 +28,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">/dev/mmcblk1p3:alios/alios.img</block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte">2048</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/mmcblk1p3</rootfs_dev>
-	<rootfs_img desc="rootfs image" readonly="true">clearlinux/clearlinux.img</rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
 	<poweroff_channel desc="the method of power off uos" readonly="true">
 	--pm_notify_channel ioc \
@@ -30,6 +28,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">/dev/mmcblk1p3:clearlinux/clearlinux.img</block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte">2048</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/mmcblk0p1</rootfs_dev>
-	<rootfs_img desc="rootfs image" readonly="true">clearlinux/clearlinux.img</rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
 	<poweroff_channel desc="the method of power off uos" readonly="true">
 	--pm_notify_channel power_button \
@@ -30,6 +28,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">/dev/mmcblk0p1:clearlinux/clearlinux.img</block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte">2048</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/mmcblk0p1</rootfs_dev>
-	<rootfs_img desc="rootfs image" readonly="true">android/android.img</rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
 	<poweroff_channel desc="the method of power off uos" readonly="true">
 	--pm_notify_channel power_button \
@@ -30,6 +28,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">/dev/mmcblk0p1:android/android.img</block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte">2048</mem_size>
 	<gvt_args desc="GVT argument for the vm">64 448 8</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<rootfs_dev desc="rootfs partition devices" readonly="true">/dev/mmcblk0p1</rootfs_dev>
-	<rootfs_img desc="rootfs image" readonly="true">clearlinux/clearlinux.img</rootfs_img>
 	<console_type desc="UOS console type">virtio-console(hvc0)</console_type>
 	<poweroff_channel desc="the method of power off uos" readonly="true">
 	--pm_notify_channel power_button \
@@ -30,6 +28,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">/dev/mmcblk0p1:clearlinux/clearlinux.img</block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
 	<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>
 	<poweroff_channel desc="the method of power off uos">
 	</poweroff_channel>
@@ -29,6 +27,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img"></block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
 	<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>
 	<poweroff_channel desc="the method of power off uos">
 	</poweroff_channel>
@@ -29,6 +27,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img"></block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
 	<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>
 	<poweroff_channel desc="the method of power off uos">
 	</poweroff_channel>
@@ -29,6 +27,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img"></block>
 	</virtio_devices>
     </uos>
     <uos id="2">
@@ -37,8 +36,6 @@
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
 	<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>
 	<poweroff_channel desc="the method of power off uos">
 	</poweroff_channel>
@@ -61,6 +58,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img"></block>
 	</virtio_devices>
     </uos>
 </acrn-config>

misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml

@@ -5,8 +5,6 @@
 	<mem_size desc="UOS memory size in MByte"></mem_size>
 	<gvt_args desc="GVT argument for the vm"></gvt_args>
 	<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>
 	<poweroff_channel desc="the method of power off uos">
 	</poweroff_channel>
@@ -29,6 +27,7 @@
 
 	<virtio_devices>
 		<input desc="virtio input device"></input>
+		<block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img"></block>
 	</virtio_devices>
     </uos>
 </acrn-config>