Add NVMe support

insofar as udisks has it...

storaged-project/udisks#386

Author: t-nelson

src/info_manager.c

@@ -216,7 +216,13 @@ parse_blk_dev_path(
     do
     {
       if (1 == sscanf(slash, "/sd%[^0-9/]", blk_dev))
-        continue;
+      {
+        strncpy(blk_dev, slash+1, MAX_BLK_DEV_LEN);
+      }
+      else if (2 == sscanf(slash, "/nvme%un%u", &dummy[0], &dummy[0]))
+      {
+        strncpy(blk_dev, slash+1, MAX_BLK_DEV_LEN);
+      }
       else if (4 == sscanf(slash, "/%u:%u:%u:%u", &dummy[0], &dummy[1], &dummy[2], &dummy[3]))
       {
         tup->host     = dummy[0];

src/output_fmt.c

@@ -111,7 +111,7 @@ get_field_blk_dev(
 
   if (st)
   {
-    if (-1 != (rc = asprintf(&f->string, "sd%s", scsi_target_get_blk_dev(st))))
+    if (-1 != (rc = asprintf(&f->string, "%s", scsi_target_get_blk_dev(st))))
       f->sort_val = f->string;
   }
   else

src/sysfs_scan.c

@@ -211,13 +211,57 @@ static bool usb_bus_dir_selector(const char* d_name, const void** next_sel, size
   return rc;
 }
 
+static bool nvme_namespace_dir_selector(const char* d_name, const void** next_sel, size_t* n_next_sel)
+{
+  unsigned int  dummy;
+  bool          rc      = (2 == sscanf(d_name, "nvme%un%u", &dummy, &dummy));
+
+  if (rc && next_sel && n_next_sel)
+  {
+    *next_sel   = NULL;
+    *n_next_sel = 0;
+  }
+
+  return rc;
+}
+
+static bool nvme_dev_dir_selector(const char* d_name, const void** next_sel, size_t* n_next_sel)
+{
+  static const  dir_selector_fn next_selectors[]  = { nvme_namespace_dir_selector };
+                unsigned int    dummy;
+                bool            rc                = (1 == sscanf(d_name, "nvme%u", &dummy));
+
+  if (rc && next_sel && n_next_sel)
+  {
+    *next_sel   = next_selectors;
+    *n_next_sel = ARRAY_SIZE(next_selectors);
+  }
+
+  return rc;
+}
+
+static bool nvme_bus_dir_selector(const char* d_name, const void** next_sel, size_t* n_next_sel)
+{
+  static const  dir_selector_fn next_selectors[]  = { nvme_dev_dir_selector };
+                bool            rc                = (0 == strcmp(d_name, "nvme"));
+
+  if (rc && next_sel && n_next_sel)
+  {
+    *next_sel   = next_selectors;
+    *n_next_sel = ARRAY_SIZE(next_selectors);
+  }
+
+  return rc;
+}
+
 static bool pci_dev_dir_selector(const char* d_name, const void** next_sel, size_t* n_next_sel)
 {
   static const  dir_selector_fn next_selectors[]  = {
                                                       pci_dev_dir_selector
                                                     , ata_dev_dir_selector
                                                     , scsi_host_dir_selector
                                                     , usb_bus_dir_selector
+                                                    , nvme_bus_dir_selector
                                                     };
                 unsigned int    dummy;
                 bool            rc                = (4 == sscanf(d_name, "%4x:%2x:%2x.%x", &dummy, &dummy, &dummy, &dummy));

src/udisks2.c

@@ -295,7 +295,7 @@ udisks2_get_blk_dev_smart(
   char*                 udisks2_blk_dev_path;
   struct blk_dev_info*  bdi                 = NULL;
 
-  if (-1 != asprintf(&udisks2_blk_dev_path, "%s/block_devices/sd%s", UDISKS_BASE_PATH, blk_dev))
+  if (-1 != asprintf(&udisks2_blk_dev_path, "%s/block_devices/%s", UDISKS_BASE_PATH, blk_dev))
   {
     DBusMessage*  req;