diff --git a/misc/acrn-config/library/hv_cfg_lib.py b/misc/acrn-config/library/hv_cfg_lib.py index a9eb86df9..f28f1d137 100644 --- a/misc/acrn-config/library/hv_cfg_lib.py +++ b/misc/acrn-config/library/hv_cfg_lib.py @@ -97,12 +97,11 @@ def ir_entries_check(str_num, cap, cap_ir_entries): def uefi_load_name_check(str_name, mis, mis_uefi_name): - if empty_check(str_name, mis, mis_uefi_name): - return + name_len = len(str_name) - if name_len > 256 or name_len < 1: + if name_len > 256 or name_len < 0: key = 'hv,{},{}'.format(mis, mis_uefi_name) - ERR_LIST[key] = "{} length should be in range[1, 256]".format(mis_uefi_name) + ERR_LIST[key] = "{} length should be in range[0, 256]".format(mis_uefi_name) def ny_support_check(sel_str, feat, feat_item, feat_sub_leaf=''): diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml index 9c45beb4b..34de3cbf9 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml index ebfe3eb0b..a6cbbb288 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/industry.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml index e9a566ba5..4877db98a 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml index b0cc1fdfe..c096792a4 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml index 76159f92f..88cb79d4a 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml @@ -50,7 +50,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml index da54d9cac..37bd4f48b 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml index 7b9869526..3fb7de1a6 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/industry.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml index fde7522aa..db29471b4 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml index fc046638c..91d9a476c 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml index 1cf7c7792..466b36c57 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml @@ -61,7 +61,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml index 795e9c28a..bfd127562 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/industry.xml @@ -61,7 +61,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml index 1e2c3612e..79bd3f9e1 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/logical_partition.xml @@ -61,7 +61,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml index b7914e6d9..14e0b7bf4 100644 --- a/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/ehl-crb-b/sdc.xml @@ -61,7 +61,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml index e55fe32ef..f2090838c 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/hybrid.xml @@ -49,7 +49,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry.xml b/misc/acrn-config/xmls/config-xmls/generic/industry.xml index 0bd3e5544..55321d303 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/industry.xml @@ -49,7 +49,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml index dd305aa16..3b51ad8cf 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml @@ -49,7 +49,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml index 44188cf01..a1325a2de 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/sdc.xml @@ -49,7 +49,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml index 84056c131..5b216eb8f 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml index ab225d675..a287be024 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml index 0193a6119..2c45bf67c 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml index 8f327c53f..ecc06860e 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml index b8427ef38..e14f93895 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml index 679df8deb..cc67f6caa 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml index 3f4e189f9..dd04f7443 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml index 831ebd94c..d6cd4b6c3 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/qemu/sdc.xml b/misc/acrn-config/xmls/config-xmls/qemu/sdc.xml index 751b106e2..1675a51e3 100644 --- a/misc/acrn-config/xmls/config-xmls/qemu/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/qemu/sdc.xml @@ -44,7 +44,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/template/HV.xml b/misc/acrn-config/xmls/config-xmls/template/HV.xml index 8cd928cff..93c4337ab 100644 --- a/misc/acrn-config/xmls/config-xmls/template/HV.xml +++ b/misc/acrn-config/xmls/config-xmls/template/HV.xml @@ -49,7 +49,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml index c5aa8ec43..b956d3205 100644 --- a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml index ee6ca760c..30b6cec46 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml index 5d3ac5bc2..b827f9d58 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/industry.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml index 4e5b3f8ac..a9976b3c4 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml index 17baf9e08..c7b17fe6d 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/sdc.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml index 0bbc80b3d..8457a2693 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml index 6109b66d7..1d2f84a77 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/industry.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml index 45cddf167..12a45e37f 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml @@ -48,7 +48,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml index 10b75c0ab..5ca5259e0 100644 --- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml +++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/sdc.xml @@ -52,7 +52,7 @@ 0x00000010 - \\EFI\\org.clearlinux\\bootloaderx64.efi + \\EFI\\BOOT\\bootx64.efi