[PATCH] ultipath-tools: standardize NVME vendor_id in hwtable

[PATCH] ultipath-tools: standardize NVME vendor_id in hwtable

[Xose Vazquez Perez]

There is no vendor_id/product_id for NVMe devices.
Just "model". and typically it's a combination of both.

"NVME" is a static tag, added in:
https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/discovery.c#L1635


Cc: Martin Wilck <mwilck@suse.com>
Cc: Benjamin Marzinski <bmarzins@redhat.com>
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: DM_DEVEL-ML <dm-devel@lists.linux.dev>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 libmultipath/hwtable.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index aedf4b88..de0af8a4 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -88,7 +88,7 @@ static struct hwentry default_hw[] = {
 	 */
 	{
 		/* Generic NVMe */
-		.vendor        = "NVM[eE]",
+		.vendor        = "^NVME",
 		.product       = ".*",
 		.uid_attribute = DEFAULT_NVME_UID_ATTRIBUTE,
 		.checker_name  = NONE,
@@ -396,7 +396,7 @@ static struct hwentry default_hw[] = {
 	},
 	{
 		/* PowerStore NVMe */
-		.vendor        = ".*",
+		.vendor        = "NVME",
 		.product       = "dellemc-powerstore",
 		.no_path_retry = 3,
 	},
@@ -738,7 +738,7 @@ static struct hwentry default_hw[] = {
 	},
 	{
 		/* FlashSystem(RamSan) NVMe */
-		.vendor        = "NVMe",
+		.vendor        = "NVME",
 		.product       = "FlashSystem",
 		.no_path_retry = NO_PATH_RETRY_FAIL,
 	},
@@ -1112,7 +1112,7 @@ static struct hwentry default_hw[] = {
 	},
 	{
 		/* OceanStor NVMe */
-		.vendor        = "NVM[eE]",
+		.vendor        = "NVME",
 		.product       = "Huawei-XSG1",
 		.checker_name  = DIRECTIO,
 		.no_path_retry = 12,
-- 
2.50.1