From 420b65a61e72de551370c44f06daeefb70db376b Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 26 Nov 2019 19:38:31 +0800 Subject: [PATCH] acrn-config: add 'usb_xhci' info to launch xmls Some vm need USB xHCI mediator support, this patch add 'usb_xhci' item to the launch config files that user can edit it from webUI. Tracked-On: #4164 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 5cd75574f..d5c405ff1 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 @@ -11,6 +11,7 @@ --pm_notify_channel ioc \ + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) 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 1a7ee697e..41293995c 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 @@ -11,6 +11,7 @@ --pm_notify_channel ioc \ + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) 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 36601b540..3846feef5 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 @@ -11,6 +11,7 @@ --pm_notify_channel ioc \ + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) 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 48b65e85a..b5d6ce868 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 @@ -11,6 +11,7 @@ --pm_notify_channel power_button \ + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) 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 a8585d3c0..31717d4c0 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 @@ -11,6 +11,7 @@ --pm_notify_channel power_button \ + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) 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 80a58c18f..d455bb9ce 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 @@ -11,6 +11,7 @@ --pm_notify_channel power_button \ + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) 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 b8397ea82..f4efae7d7 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 @@ -10,6 +10,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 76fe16767..f60a20186 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 @@ -10,6 +10,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 16a17a614..dba1e9f33 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 @@ -10,6 +10,7 @@ + @@ -41,6 +42,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 eec84cd3b..d16ea7d2d 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 @@ -10,6 +10,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 2a77c1384..30158d041 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 @@ -8,6 +8,7 @@ virtio-console(hvc0) + 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 a18eb54e3..9e2ce3f21 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 @@ -8,6 +8,7 @@ /dev/sda3 ./VxWorks.img virtio-console(hvc0) + 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 a0189131e..7234eac36 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + 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 9ad0915a8..98234d986 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + @@ -38,6 +39,7 @@ virtio-console(hvc0) + 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 5fec5dc98..bfe1dfa47 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 @@ -11,6 +11,7 @@ --pm_notify_channel power_button \ + 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 893b9b8b1..a3bb3fa0e 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 @@ -8,6 +8,7 @@ /dev/sda3 ./zephyr.img com1(ttyS0) + 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 820dab793..a6dc1c183 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 @@ -8,6 +8,7 @@ virtio-console(hvc0) + 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 9dd795a69..015d90243 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 @@ -8,6 +8,7 @@ /dev/sda3 ./VxWorks.img virtio-console(hvc0) + 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 497c8f006..af0e0e29e 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + 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 ddbaa7cfc..af533a170 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + @@ -38,6 +39,7 @@ virtio-console(hvc0) + 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 eefeef116..e5a41a9cc 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 @@ -11,6 +11,7 @@ --pm_notify_channel power_button \ + 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 9b3225f33..444eda558 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 @@ -8,6 +8,7 @@ /dev/sda3 ./zephyr.img com1(ttyS0) + 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 d4c21ee10..323ba4076 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 @@ -8,6 +8,7 @@ virtio-console(hvc0) + 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 3416dffe7..b221a9484 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 @@ -8,6 +8,7 @@ /dev/sda3 ./VxWorks.img virtio-console(hvc0) + 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 d93ffaf3d..d7b0ed699 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + 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 939ab878c..3d9a296bd 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + @@ -38,6 +39,7 @@ virtio-console(hvc0) + 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 7b1f169a6..c1937861d 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 @@ -11,6 +11,7 @@ --pm_notify_channel power_button \ + 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 564abb28c..0c8e66a79 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 @@ -8,6 +8,7 @@ /dev/sda3 ./zephyr.img com1(ttyS0) + 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 072348f36..77c400b68 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 @@ -8,6 +8,7 @@ virtio-console(hvc0) + 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 8a3f98a34..803386f31 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 @@ -8,6 +8,7 @@ /dev/sda3 ./VxWorks.img virtio-console(hvc0) + 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 1adee4086..1b42fcc42 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + 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 9d6ed46fc..372b7058a 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 @@ -8,6 +8,7 @@ /dev/sda3 ./win10-ltsc.img com1(ttyS0) + @@ -38,6 +39,7 @@ virtio-console(hvc0) + 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 a3235ec7f..27073c461 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 @@ -11,6 +11,7 @@ --pm_notify_channel power_button \ + 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 38c77bdf2..851ed14e7 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 @@ -8,6 +8,7 @@ /dev/sda3 ./zephyr.img com1(ttyS0) +