Simplify root device discover and don't fail when trying to open

	incorrect devices.

	* grub-core/disk/efi/efidisk.c (get_diskname_from_path_real): New
	function.
	(get_diskname_from_path): Likewise.
	(grub_efidisk_get_device_name): Use get_diskname_from_path instead
	of iterating.

diff --git a/ChangeLog b/ChangeLog
index 5f67c4804c85fe9d022b955ae045c0a4369f1359..fdbeaeb76f573ff8a927b756ed05d2d1b4a3c633 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Simplify root device discover and don't fail when trying to open
+       incorrect devices.
+
+       * grub-core/disk/efi/efidisk.c (get_diskname_from_path_real): New
+       function.
+       (get_diskname_from_path): Likewise.
+       (grub_efidisk_get_device_name): Use get_diskname_from_path instead
+       of iterating.
+
 2012-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/Makefile.core.def (setpci): Enable on all PCI platforms.

diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index bbb8c93b1fe5393145d5793617455ba4e7d53439..85aa28fcf037cac25fcbda17b52f99456baefab0 100644 (file)
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -664,38 +664,52 @@ grub_efidisk_get_device_handle (grub_disk_t disk)
   return 0;
 }
 
-char *
-grub_efidisk_get_device_name (grub_efi_handle_t *handle)
+#define NEEDED_BUFLEN sizeof ("XdXXXXXXXXXX")
+static inline int
+get_diskname_from_path_real (const grub_efi_device_path_t *path,
+                            struct grub_efidisk_data *head,
+                            char *buf)
 {
-  grub_efi_device_path_t *dp, *ldp, *sdp;
-  /* This is a hard disk partition.  */
-  grub_disk_t parent = 0;
-  auto int find_parent_disk (const char *name);
-
-  /* Find the disk which is the parent of a given hard disk partition.  */
-  int find_parent_disk (const char *name)
-  {
-    grub_disk_t disk;
+  int count = 0;
+  struct grub_efidisk_data *d;
+  for (d = head, count = 0; d; d = d->next, count++)
+    if (grub_efi_compare_device_paths (d->device_path, path) == 0)
+      {
+       grub_snprintf (buf, NEEDED_BUFLEN - 1, "d%d", count);
+       return 1;
+      }
+  return 0;
+}
 
-    disk = grub_disk_open (name);
-    if (! disk)
+static inline int
+get_diskname_from_path (const grub_efi_device_path_t *path,
+                       char *buf)
+{
+  if (get_diskname_from_path_real (path, hd_devices, buf + 1))
+    {
+      buf[0] = 'h';
       return 1;
+    }
 
-    if (disk->dev->id == GRUB_DISK_DEVICE_EFIDISK_ID)
-      {
-       struct grub_efidisk_data *d;
+  if (get_diskname_from_path_real (path, fd_devices, buf + 1))
+    {
+      buf[0] = 'f';
+      return 1;
+    }
 
-       d = disk->data;
-       if (grub_efi_compare_device_paths (d->device_path, sdp) == 0)
-         {
-           parent = disk;
-           return 1;
-         }
-      }
+  if (get_diskname_from_path_real (path, cd_devices, buf + 1))
+    {
+      buf[0] = 'c';
+      return 1;
+    }
+  return 0;
+}
 
-    grub_disk_close (disk);
-    return 0;
-  }
+char *
+grub_efidisk_get_device_name (grub_efi_handle_t *handle)
+{
+  grub_efi_device_path_t *dp, *ldp;
+  char device_name[NEEDED_BUFLEN];
 
   dp = grub_efi_get_device_path (handle);
   if (! dp)
@@ -710,9 +724,11 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
          == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE))
     {
       char *partition_name = NULL;
-      char *device_name;
+      char *dev_name;
       grub_efi_device_path_t *dup_dp, *dup_ldp;
       grub_efi_hard_drive_device_path_t hd;
+      grub_disk_t parent = 0;
+
       auto int find_partition (grub_disk_t disk, const grub_partition_t part);
 
       /* Find the identical partition.  */
@@ -741,11 +757,9 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
       dup_ldp->length[0] = sizeof (*dup_ldp);
       dup_ldp->length[1] = 0;
 
-      sdp = dup_dp;
-
-      grub_efidisk_iterate (find_parent_disk, GRUB_DISK_PULL_NONE);
-      if (!parent)
-       grub_efidisk_iterate (find_parent_disk, GRUB_DISK_PULL_REMOVABLE);
+      if (!get_diskname_from_path (dup_dp, device_name))
+       return 0;
+      parent = grub_disk_open (device_name);
       grub_free (dup_dp);
 
       if (! parent)
@@ -756,7 +770,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
       if (hd.partition_start == 0
          && hd.partition_size == grub_disk_get_size (parent))
        {
-         device_name = grub_strdup (parent->name);
+         dev_name = grub_strdup (parent->name);
        }
       else
        {
@@ -768,27 +782,18 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
              return 0;
            }
 
-         device_name = grub_xasprintf ("%s,%s", parent->name, partition_name);
+         dev_name = grub_xasprintf ("%s,%s", parent->name, partition_name);
          grub_free (partition_name);
        }
       grub_disk_close (parent);
 
-      return device_name;
+      return dev_name;
     }
   else
     {
       /* This should be an entire disk.  */
-      char *device_name = 0;
-
-      sdp = dp;
-
-      grub_efidisk_iterate (find_parent_disk, GRUB_DISK_PULL_NONE);
-      if (!parent)
-       grub_efidisk_iterate (find_parent_disk, GRUB_DISK_PULL_REMOVABLE);
-      if (!parent)
-       return NULL;
-      device_name = grub_strdup (parent->name);
-      grub_disk_close (parent);
-      return device_name;
+      if (!get_diskname_from_path (dp, device_name))
+       return 0;
+      return grub_strdup (device_name);
     }
 }