From 593e504c9062a5488c589b7f771b4cb480e8f568 Mon Sep 17 00:00:00 2001 From: Zhouhua Liu Date: Fri, 22 May 2020 11:40:40 +0800 Subject: [PATCH] nvme-cli: Add huawei vendor id as filter in command "nvme huawei list" Add huawei vendor id as filter in command "nvme huawei list". Signed-off-by: Zhouhua Liu --- plugins/huawei/huawei-nvme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c index c935f47..482ea0d 100644 --- a/plugins/huawei/huawei-nvme.c +++ b/plugins/huawei/huawei-nvme.c @@ -41,6 +41,7 @@ #define CREATE_CMD #include "huawei-nvme.h" +#define HW_SSD_PCI_VENDOR_ID 0x19E5 #define ARRAY_NAME_LEN 80 #define NS_NAME_LEN 40 @@ -80,16 +81,15 @@ static int huawei_get_nvme_info(int fd, struct huawei_list_item *item, const cha return err; /*identify huawei device*/ - if (strstr(item->ctrl.mn, "Huawei") == NULL) { + if (strstr(item->ctrl.mn, "Huawei") == NULL && + le16_to_cpu(item->ctrl.vid) != HW_SSD_PCI_VENDOR_ID) { item->huawei_device = false; return 0; } - else - item->huawei_device = true; + item->huawei_device = true; item->nsid = nvme_get_nsid(fd); - err = nvme_identify_ns(fd, item->nsid, - 0, &item->ns); + err = nvme_identify_ns(fd, item->nsid, 0, &item->ns); if (err) return err; -- 2.49.0