[PATCH V2] nvme-cli: Add huawei vendor id as filter in command "nvme huawei list"

[PATCH V2] nvme-cli: Add huawei vendor id as filter in command "nvme huawei list"

[Zhouhua Liu]

This patch V2 is to add huawei vendor id as filter in command "nvme huawei list".
And comparing with the last patch, I have remove the symbol \ to comply with coding style.


Signed-off-by: Zhouhua Liu <liuzhouhua@huawei.com>
---
 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..b4aef1e 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.22.0



_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

Re: [PATCH V2] nvme-cli: Add huawei vendor id as filter in command "nvme huawei list"

[Keith Busch]

On Fri, May 22, 2020 at 11:40:40AM +0800, Zhouhua Liu wrote:
> This patch V2 is to add huawei vendor id as filter in command "nvme huawei list".
> And comparing with the last patch, I have remove the symbol \ to comply with coding style.
> 
> Signed-off-by: Zhouhua Liu <liuzhouhua@huawei.com>

I've hand applied this with a more appropriate commit message (no need
to mention version changes there), and fixed tabs/spaces. Thanks!

_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme