From 25b2a26e34c98c3ce1ed3f24684a1d731781ecbb Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 3 Dec 2019 09:31:33 +0800 Subject: [PATCH] acrn-config: add 'virtio-network' info in launch xmls Some vm need mediator of 'virtio-net', so add 'virtio-network' item into the launch config files that user could edit them from webUI. Tracked-On: #4185 Signed-off-by: Wei Liu Acked-by: Victor Sun --- .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml | 1 + .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml | 1 + .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml | 1 + .../xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml | 1 + .../xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml | 1 + .../xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml | 1 + .../acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml | 1 + .../xmls/config-xmls/generic/industry_launch_1uos.xml | 1 + .../xmls/config-xmls/generic/industry_launch_2uos.xml | 2 ++ misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml | 1 + .../xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml | 1 + .../xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml | 1 + .../xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml | 1 + .../xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml | 2 ++ .../xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml | 1 + .../xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml | 1 + .../xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml | 1 + .../xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml | 1 + .../xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml | 1 + .../xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml | 2 ++ .../xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml | 1 + .../xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml | 1 + .../xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml | 1 + .../config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml | 1 + .../xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml | 1 + .../xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml | 2 ++ .../xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml | 1 + .../xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml | 1 + .../xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml | 1 + .../config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml | 1 + .../xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml | 1 + .../xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml | 2 ++ .../xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml | 1 + .../xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml | 1 + 34 files changed, 39 insertions(+) diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml index 71cf580e1..e25467a0d 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml @@ -27,6 +27,7 @@ + AaaG /dev/mmcblk1p3:android/android.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml index da2fa2e3f..60bdb88c6 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml @@ -27,6 +27,7 @@ + AliaaG /dev/mmcblk1p3:alios/alios.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml index fc429efe4..d3beb4be7 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml @@ -27,6 +27,7 @@ + LaaG /dev/mmcblk1p3:clearlinux/clearlinux.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml index 54e7160c6..78f84ecec 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml @@ -27,6 +27,7 @@ + LaaG /dev/mmcblk0p1:clearlinux/clearlinux.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml index 8d04ab793..3ef1e478d 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml @@ -27,6 +27,7 @@ + AaaG /dev/mmcblk0p1:android/android.img diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml index 92a9d57fe..3ec9bf3f4 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml @@ -27,6 +27,7 @@ + LaaG /dev/mmcblk0p1:clearlinux/clearlinux.img 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 963ee0dd1..c7e68991c 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 @@ -26,6 +26,7 @@ + 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 3b158a7db..37d3e8795 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 @@ -26,6 +26,7 @@ + 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 379944b63..2d3550c60 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 @@ -26,6 +26,7 @@ + @@ -57,6 +58,7 @@ + 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 a93594153..013b90d7e 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 @@ -26,6 +26,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml index f92464b12..eb84e5188 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml @@ -24,6 +24,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml index c21986503..ab2779324 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml @@ -24,6 +24,7 @@ + ./VxWorks.img 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 84cab48b8..4a5a483dc 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img 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 d6363affb..15660625b 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img @@ -54,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml index 51aecde19..eb3162f11 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml @@ -27,6 +27,7 @@ + LaaG /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml index ae8e4a554..a4dc5ab41 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml @@ -24,6 +24,7 @@ + ./zephyr.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml index 6b0c4207b..5ecc58b93 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml @@ -24,6 +24,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml index 23933f064..c49e76db8 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml @@ -24,6 +24,7 @@ + ./VxWorks.img 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 7a92c5a6b..bd8136ddd 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img 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 220ae4238..033994ad2 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img @@ -54,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml index 399f92390..285d8f900 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml @@ -27,6 +27,7 @@ + LaaG /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml index 40cfd191d..6b0f1af0c 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml @@ -24,6 +24,7 @@ + ./zephyr.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml index 2b9b10fcc..ad55f9fd9 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml @@ -24,6 +24,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml index bc661b457..0657f60ee 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml @@ -24,6 +24,7 @@ + ./VxWorks.img 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 16ebddef4..1034b5005 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img 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 8348a4bb3..432b0fd1f 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img @@ -54,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml index ae62edd2a..cdcfae508 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml @@ -27,6 +27,7 @@ + LaaG /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml index 002aa3aeb..bdd36d1a5 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml @@ -24,6 +24,7 @@ + ./zephyr.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml index 45e0cbd31..c2950b3c1 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml @@ -24,6 +24,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml index e8311ac26..1bb296802 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml @@ -24,6 +24,7 @@ + ./VxWorks.img 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 5a9a01610..69cc24944 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img 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 e7885f3e7..9bdf251e3 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 @@ -24,6 +24,7 @@ + WaaG ./win10-ltsc.img @@ -54,6 +55,7 @@ + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml index aa3bb18f3..330a6e5af 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml @@ -27,6 +27,7 @@ + LaaG /home/clear/uos/uos.img diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml index 7509104d8..aff0eefda 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml @@ -24,6 +24,7 @@ + ./zephyr.img