port_info in freeBSD has no domain_id, so update regex to adapt to it Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- framework/pmd_output.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/pmd_output.py b/framework/pmd_output.py index bcb3865..e420a65 100644 --- a/framework/pmd_output.py +++ b/framework/pmd_output.py @@ -109,9 +109,9 @@ class PmdOutput(): :param eal_param: :return: """ - re_w_pci_str = '-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s' + re_w_pci_str = '\s?-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-w\\s+.+?:.+?\\..+?[,.*=\d+]?\s' re_file_prefix_str = '--file-prefix=.+?\s' - re_b_pci_str = '-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s' + re_b_pci_str = '\s?-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-b\\s+.+?:.+?\\..+?[,.*=\d+]?\s' eal_param = eal_param + ' ' # pci_str_list eg: ['-w 0000:1a:00.0 ', '-w 0000:1a:00.1,queue-num-per-vf=4 ', '-w 0000:aa:bb.1,queue-num-per-vf=4 '] w_pci_str_list = re.findall(re_w_pci_str, eal_param) -- 1.8.3.1
Tested-by: Xiao, QimaiX <qimaix.xiao@intel.com> Best Regards, Xiao,Qimai -----Original Message----- From: Xiao, QimaiX Sent: Tuesday, October 15, 2019 6:04 PM To: dts@dpdk.org Cc: Xiao, QimaiX <qimaix.xiao@intel.com> Subject: [dts][PATCH V1] framework/pmd_output: update regex to support freeBSD port_info in freeBSD has no domain_id, so update regex to adapt to it Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- framework/pmd_output.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/pmd_output.py b/framework/pmd_output.py index bcb3865..e420a65 100644 --- a/framework/pmd_output.py +++ b/framework/pmd_output.py @@ -109,9 +109,9 @@ class PmdOutput(): :param eal_param: :return: """ - re_w_pci_str = '-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s' + re_w_pci_str = '\s?-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-w\\s+.+?:.+?\\..+?[,.*=\d+]?\s' re_file_prefix_str = '--file-prefix=.+?\s' - re_b_pci_str = '-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s' + re_b_pci_str = '\s?-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-b\\s+.+?:.+?\\..+?[,.*=\d+]?\s' eal_param = eal_param + ' ' # pci_str_list eg: ['-w 0000:1a:00.0 ', '-w 0000:1a:00.1,queue-num-per-vf=4 ', '-w 0000:aa:bb.1,queue-num-per-vf=4 '] w_pci_str_list = re.findall(re_w_pci_str, eal_param) -- 1.8.3.1
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Tuesday, October 15, 2019 6:04 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1] framework/pmd_output: update regex to support
> freeBSD
>
> port_info in freeBSD has no domain_id, so update regex to adapt to it
>
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
> framework/pmd_output.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/framework/pmd_output.py b/framework/pmd_output.py index
> bcb3865..e420a65 100644
> --- a/framework/pmd_output.py
> +++ b/framework/pmd_output.py
> @@ -109,9 +109,9 @@ class PmdOutput():
> :param eal_param:
> :return:
> """
> - re_w_pci_str = '-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s'
> + re_w_pci_str = '\s?-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-
> w\\s+.+?:.+?\\..+?[,.*=\d+]?\s'
> re_file_prefix_str = '--file-prefix=.+?\s'
> - re_b_pci_str = '-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s'
> + re_b_pci_str = '\s?-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-
> b\\s+.+?:.+?\\..+?[,.*=\d+]?\s'
> eal_param = eal_param + ' '
> # pci_str_list eg: ['-w 0000:1a:00.0 ', '-w 0000:1a:00.1,queue-num-per-
> vf=4 ', '-w 0000:aa:bb.1,queue-num-per-vf=4 ']
> w_pci_str_list = re.findall(re_w_pci_str, eal_param)
> --
> 1.8.3.1