config_tools: update the upgrader.py script for virtio devices

We have redesigned Virtio devices, so this patch updates
the upgrader.py script for them.

Tracked-On: #6690
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>

misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml

@@ -148,7 +148,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -173,8 +176,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>

misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml

@@ -102,7 +102,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -130,8 +133,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>RT</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>RT</interface_name>
+      </network>
       <input/>
       <block>./core-image-weston-intel-corei7-64.wic</block>
     </virtio_devices>
@@ -158,8 +167,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG3</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG3</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -186,8 +201,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG4</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG4</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -214,8 +235,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG5</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG5</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -242,8 +269,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG6</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG6</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>

misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml

@@ -148,7 +148,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -173,8 +176,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>

misc/config_tools/data/generic_board/shared_launch_6user_vm.xml

@@ -110,7 +110,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -138,8 +141,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>RT</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>RT</interface_name>
+      </network>
       <input/>
       <block>./core-image-weston-intel-corei7-64.wic</block>
     </virtio_devices>
@@ -166,8 +175,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG3</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG3</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -194,8 +209,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG4</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG4</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -222,8 +243,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG5</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG5</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -250,8 +277,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG6</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG6</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>

misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml

@@ -148,7 +148,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -173,8 +176,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>YaaG</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>

misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml

@@ -122,7 +122,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+	<virtio_framework/>
+	<interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -150,8 +153,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>RT</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+	<virtio_framework/>
+	<interface_name>RT</interface_name>
+      </network>
       <input/>
       <block>./core-image-weston-intel-corei7-64.wic</block>
     </virtio_devices>
@@ -178,8 +187,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG3</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+	<virtio_framework/>
+	<interface_name>YaaG3</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -206,8 +221,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG4</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+	<virtio_framework/>
+	<interface_name>YaaG4</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -234,8 +255,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG5</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+	<virtio_framework/>
+	<interface_name>YaaG5</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
@@ -262,8 +289,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>YaaG6</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+	<virtio_framework/>
+	<interface_name>YaaG6</interface_name>
+      </network>
       <input/>
       <block>./YaaG.img</block>
     </virtio_devices>

misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml

@@ -123,8 +123,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>WaaG</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -153,8 +159,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>RT</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>RT</interface_name>
+      </network>
       <input/>
       <block>./core-image-weston-intel-corei7-64.wic</block>
     </virtio_devices>

misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml

@@ -164,7 +164,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>

misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml

@@ -113,8 +113,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>RT</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>RT</interface_name>
+      </network>
       <input/>
       <block>./core-image-weston-intel-corei7-64.wic</block>
     </virtio_devices>

misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml

@@ -99,7 +99,10 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
       <network/>
       <input/>
       <block>./VxWorks.img</block>

misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml

@@ -103,7 +103,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>

misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml

@@ -103,7 +103,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -131,8 +134,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>RT</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>RT</interface_name>
+      </network>
       <input/>
       <block>./core-image-weston-intel-corei7-64.wic</block>
     </virtio_devices>

misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml

@@ -103,7 +103,10 @@
     <usb_xhci/>
     <virtio_devices>
       <console/>
-      <network>WaaG</network>
+      <network>
+        <virtio_framework/>
+        <interface_name>WaaG</interface_name>
+      </network>
       <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
@@ -131,8 +134,14 @@
     <vuart0>Disable</vuart0>
     <usb_xhci/>
     <virtio_devices>
-      <console>@stdio:stdio_port</console>
-      <network>RT</network>
+      <console>
+        <use_type>Virtio console</use_type>
+        <backend_type>stdio</backend_type>
+      </console>
+      <network>
+        <virtio_framework/>
+        <interface_name>RT</interface_name>
+      </network>
       <input/>
       <block>./core-image-weston-intel-corei7-64.wic</block>
     </virtio_devices>