X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-path_id.c;h=d6b3736aeee6619346c90c4116def99d982cdb1b;hb=7ad94c716d6403233d04c4d37cb14df958c9b65d;hp=720f616da5b28b1e26ee1112f93b95a5e1fe8524;hpb=1c7dfbf249f5320d0675fcb03556a55881e21457;p=elogind.git

diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 720f616da..d6b3736ae 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -1,7 +1,7 @@
 /*
  * compose persistent device path
  *
- * Copyright (C) 2009-2011 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2009-2011 Kay Sievers <kay@vrfy.org>
  *
  * Logic based on Hannes Reinecke's shell script.
  *
@@ -97,7 +97,7 @@ static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent,
         struct udev_device *targetdev;
         struct udev_device *fcdev = NULL;
         const char *port;
-        char *lun = NULL;;
+        char *lun = NULL;
 
         targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
         if (targetdev == NULL)
@@ -302,6 +302,42 @@ out:
         return hostdev;
 }
 
+static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char **path) {
+        struct udev_device *hostdev;
+        struct udev_device *vmbusdev;
+        const char *guid_str;
+        char *lun = NULL;
+        char guid[38];
+        size_t i, k;
+
+        hostdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_host");
+        if (!hostdev)
+                return NULL;
+
+        vmbusdev = udev_device_get_parent(hostdev);
+        if (!vmbusdev)
+                return NULL;
+
+        guid_str = udev_device_get_sysattr_value(vmbusdev, "device_id");
+        if (!guid_str)
+                return NULL;
+
+        if (strlen(guid_str) < 37 || guid_str[0] != '{' || guid_str[36] != '}')
+                return NULL;
+
+        for (i = 1, k = 0; i < 36; i++) {
+                if (guid_str[i] == '-')
+                        continue;
+                guid[k++] = guid_str[i];
+        }
+        guid[k] = '\0';
+
+        format_lun_number(parent, &lun);
+        path_prepend(path, "vmbus-%s-%s", guid, lun);
+        free(lun);
+        return parent;
+}
+
 static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
 {
         const char *devtype;
@@ -320,7 +356,7 @@ static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
                 goto out;
         }
 
-        /* lousy scsi sysfs does not have a "subsystem" for the transport */
+        /* scsi sysfs does not have a "subsystem" for the transport */
         name = udev_device_get_syspath(parent);
 
         if (strstr(name, "/rport-") != NULL) {
@@ -339,18 +375,26 @@ static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
         }
 
         /*
-         * We do not support the ATA transport class, it creates duplicated link
-         * names as the fake SCSI host adapters are all separated, they are all
-         * re-based as host == 0. ATA should just stop faking two duplicated
-         * hierarchies for a single topology and leave the SCSI stuff alone;
-         * until that happens, there are no by-path/ links for ATA devices behind
-         * an ATA transport class.
+         * We do not support the ATA transport class, it uses global counters
+         * to name the ata devices which numbers spread across multiple
+         * controllers.
+         *
+         * The real link numbers are not exported. Also, possible chains of ports
+         * behind port multipliers cannot be composed that way.
+         *
+         * Until all that is solved at the kernel level, there are no by-path/
+         * links for ATA devices.
          */
         if (strstr(name, "/ata") != NULL) {
                 parent = NULL;
                 goto out;
         }
 
+        if (strstr(name, "/vmbus_") != NULL) {
+                parent = handle_scsi_hyperv(parent, path);
+                goto out;
+        }
+
         parent = handle_scsi_default(parent, path);
 out:
         return parent;
@@ -484,6 +528,9 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
                 } else if (strcmp(subsys, "virtio") == 0) {
                         path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent));
                         parent = skip_subsystem(parent, "virtio");
+                } else if (strcmp(subsys, "scm") == 0) {
+                        path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
+                        parent = skip_subsystem(parent, "scm");
                 }
 
                 parent = udev_device_get_parent(parent);