2006-04-23 13:37:36 +00:00
|
|
|
/*
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
|
|
|
* Copyright (C) 2006 Free Software Foundation, Inc.
|
|
|
|
*
|
|
|
|
* GRUB is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with GRUB; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <grub/disk.h>
|
2006-04-25 20:08:31 +00:00
|
|
|
#include <grub/partition.h>
|
2006-04-23 13:37:36 +00:00
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/term.h>
|
|
|
|
#include <grub/efi/api.h>
|
|
|
|
#include <grub/efi/efi.h>
|
|
|
|
#include <grub/efi/disk.h>
|
|
|
|
|
|
|
|
struct grub_efidisk_data
|
|
|
|
{
|
|
|
|
grub_efi_handle_t handle;
|
|
|
|
grub_efi_device_path_t *device_path;
|
|
|
|
grub_efi_device_path_t *last_device_path;
|
|
|
|
grub_efi_block_io_t *block_io;
|
|
|
|
grub_efi_disk_io_t *disk_io;
|
|
|
|
struct grub_efidisk_data *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* GUIDs. */
|
|
|
|
static grub_efi_guid_t disk_io_guid = GRUB_EFI_DISK_IO_GUID;
|
|
|
|
static grub_efi_guid_t block_io_guid = GRUB_EFI_BLOCK_IO_GUID;
|
|
|
|
|
|
|
|
static struct grub_efidisk_data *fd_devices;
|
|
|
|
static struct grub_efidisk_data *hd_devices;
|
|
|
|
static struct grub_efidisk_data *cd_devices;
|
|
|
|
|
|
|
|
/* Duplicate a device path. */
|
|
|
|
static grub_efi_device_path_t *
|
|
|
|
duplicate_device_path (const grub_efi_device_path_t *dp)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *p;
|
|
|
|
grub_size_t total_size = 0;
|
|
|
|
|
|
|
|
for (p = (grub_efi_device_path_t *) dp;
|
|
|
|
;
|
|
|
|
p = GRUB_EFI_NEXT_DEVICE_PATH (p))
|
|
|
|
{
|
|
|
|
total_size += GRUB_EFI_DEVICE_PATH_LENGTH (p);
|
|
|
|
if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (p))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = grub_malloc (total_size);
|
|
|
|
if (! p)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
grub_memcpy (p, dp, total_size);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the device path node right before the end node. */
|
|
|
|
static grub_efi_device_path_t *
|
|
|
|
find_last_device_path (const grub_efi_device_path_t *dp)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *next, *p;
|
|
|
|
|
|
|
|
if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (p = (grub_efi_device_path_t *) dp, next = GRUB_EFI_NEXT_DEVICE_PATH (p);
|
|
|
|
! GRUB_EFI_END_ENTIRE_DEVICE_PATH (next);
|
|
|
|
p = next, next = GRUB_EFI_NEXT_DEVICE_PATH (next))
|
|
|
|
;
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare device paths. */
|
|
|
|
static int
|
|
|
|
compare_device_paths (const grub_efi_device_path_t *dp1,
|
|
|
|
const grub_efi_device_path_t *dp2)
|
|
|
|
{
|
|
|
|
if (! dp1 || ! dp2)
|
|
|
|
/* Return non-zero. */
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
grub_efi_uint8_t type1, type2;
|
|
|
|
grub_efi_uint8_t subtype1, subtype2;
|
|
|
|
grub_efi_uint16_t len1, len2;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
type1 = GRUB_EFI_DEVICE_PATH_TYPE (dp1);
|
|
|
|
type2 = GRUB_EFI_DEVICE_PATH_TYPE (dp2);
|
|
|
|
|
|
|
|
if (type1 != type2)
|
|
|
|
return (int) type2 - (int) type1;
|
|
|
|
|
|
|
|
subtype1 = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp1);
|
|
|
|
subtype2 = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp2);
|
|
|
|
|
|
|
|
if (subtype1 != subtype2)
|
|
|
|
return (int) subtype1 - (int) subtype2;
|
|
|
|
|
|
|
|
len1 = GRUB_EFI_DEVICE_PATH_LENGTH (dp1);
|
|
|
|
len2 = GRUB_EFI_DEVICE_PATH_LENGTH (dp2);
|
|
|
|
|
|
|
|
if (len1 != len2)
|
|
|
|
return (int) len1 - (int) len2;
|
|
|
|
|
|
|
|
ret = grub_memcmp (dp1, dp2, len1);
|
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp1))
|
|
|
|
break;
|
|
|
|
|
|
|
|
dp1 = (grub_efi_device_path_t *) ((char *) dp1 + len1);
|
|
|
|
dp2 = (grub_efi_device_path_t *) ((char *) dp2 + len2);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct grub_efidisk_data *
|
|
|
|
make_devices (void)
|
|
|
|
{
|
|
|
|
grub_efi_uintn_t num_handles;
|
|
|
|
grub_efi_handle_t *handles;
|
|
|
|
grub_efi_handle_t *handle;
|
|
|
|
struct grub_efidisk_data *devices = 0;
|
|
|
|
|
|
|
|
/* Find handles which support the disk io interface. */
|
|
|
|
handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, &disk_io_guid,
|
|
|
|
0, &num_handles);
|
|
|
|
if (! handles)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Make a linked list of devices. */
|
|
|
|
for (handle = handles; num_handles--; handle++)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *dp;
|
|
|
|
grub_efi_device_path_t *ldp;
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
grub_efi_block_io_t *bio;
|
|
|
|
grub_efi_disk_io_t *dio;
|
|
|
|
|
2006-04-30 21:09:37 +00:00
|
|
|
dp = grub_efi_get_device_path (*handle);
|
2006-04-23 13:37:36 +00:00
|
|
|
if (! dp)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
ldp = find_last_device_path (dp);
|
|
|
|
if (! ldp)
|
|
|
|
/* This is empty. Why? */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bio = grub_efi_open_protocol (*handle, &block_io_guid,
|
|
|
|
GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
|
|
|
dio = grub_efi_open_protocol (*handle, &disk_io_guid,
|
|
|
|
GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
|
|
|
|
if (! bio || ! dio)
|
|
|
|
/* This should not happen... Why? */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
d = grub_malloc (sizeof (*d));
|
|
|
|
if (! d)
|
|
|
|
{
|
|
|
|
/* Uggh. */
|
|
|
|
grub_free (handles);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
d->handle = *handle;
|
|
|
|
d->device_path = dp;
|
|
|
|
d->last_device_path = ldp;
|
|
|
|
d->block_io = bio;
|
|
|
|
d->disk_io = dio;
|
|
|
|
d->next = devices;
|
|
|
|
devices = d;
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_free (handles);
|
|
|
|
|
|
|
|
return devices;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the parent device. */
|
|
|
|
static struct grub_efidisk_data *
|
|
|
|
find_parent_device (struct grub_efidisk_data *devices,
|
|
|
|
struct grub_efidisk_data *d)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *dp, *ldp;
|
|
|
|
struct grub_efidisk_data *parent;
|
|
|
|
|
|
|
|
dp = duplicate_device_path (d->device_path);
|
|
|
|
if (! dp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ldp = find_last_device_path (dp);
|
|
|
|
ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
|
|
|
|
ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
|
|
|
|
ldp->length[0] = sizeof (*ldp);
|
|
|
|
ldp->length[1] = 0;
|
|
|
|
|
|
|
|
for (parent = devices; parent; parent = parent->next)
|
|
|
|
{
|
|
|
|
/* Ignore itself. */
|
|
|
|
if (parent == d)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (compare_device_paths (parent->device_path, dp) == 0)
|
|
|
|
{
|
|
|
|
/* Found. */
|
|
|
|
if (! parent->last_device_path)
|
|
|
|
parent = 0;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_free (dp);
|
|
|
|
return parent;
|
|
|
|
}
|
|
|
|
|
2006-04-25 20:08:31 +00:00
|
|
|
static int
|
|
|
|
iterate_child_devices (struct grub_efidisk_data *devices,
|
|
|
|
struct grub_efidisk_data *d,
|
|
|
|
int (*hook) (struct grub_efidisk_data *child))
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *p;
|
|
|
|
|
|
|
|
for (p = devices; p; p = p->next)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *dp, *ldp;
|
|
|
|
|
|
|
|
dp = duplicate_device_path (p->device_path);
|
|
|
|
if (! dp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ldp = find_last_device_path (dp);
|
|
|
|
ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
|
|
|
|
ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
|
|
|
|
ldp->length[0] = sizeof (*ldp);
|
|
|
|
ldp->length[1] = 0;
|
|
|
|
|
|
|
|
if (compare_device_paths (dp, d->device_path) == 0)
|
|
|
|
if (hook (p))
|
|
|
|
{
|
|
|
|
grub_free (dp);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_free (dp);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-23 13:37:36 +00:00
|
|
|
/* Add a device into a list of devices in an ascending order. */
|
|
|
|
static void
|
|
|
|
add_device (struct grub_efidisk_data **devices, struct grub_efidisk_data *d)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data **p;
|
|
|
|
struct grub_efidisk_data *n;
|
|
|
|
|
|
|
|
for (p = devices; *p; p = &((*p)->next))
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2006-04-25 20:08:31 +00:00
|
|
|
ret = compare_device_paths (find_last_device_path ((*p)->device_path),
|
|
|
|
find_last_device_path (d->device_path));
|
|
|
|
if (ret == 0)
|
|
|
|
ret = compare_device_paths ((*p)->device_path,
|
|
|
|
d->device_path);
|
2006-04-23 13:37:36 +00:00
|
|
|
if (ret == 0)
|
|
|
|
return;
|
|
|
|
else if (ret > 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
n = grub_malloc (sizeof (*n));
|
|
|
|
if (! n)
|
|
|
|
return;
|
|
|
|
|
|
|
|
grub_memcpy (n, d, sizeof (*n));
|
|
|
|
n->next = (*p);
|
|
|
|
(*p) = n;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Name the devices. */
|
|
|
|
static void
|
|
|
|
name_devices (struct grub_efidisk_data *devices)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
|
|
|
|
/* First, identify devices by media device paths. */
|
|
|
|
for (d = devices; d; d = d->next)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *dp;
|
|
|
|
|
|
|
|
dp = d->last_device_path;
|
|
|
|
if (! dp)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE)
|
|
|
|
{
|
|
|
|
int is_hard_drive = 0;
|
|
|
|
|
|
|
|
switch (GRUB_EFI_DEVICE_PATH_SUBTYPE (dp))
|
|
|
|
{
|
|
|
|
case GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE:
|
|
|
|
is_hard_drive = 1;
|
|
|
|
/* Fall through by intention. */
|
|
|
|
case GRUB_EFI_CDROM_DEVICE_PATH_SUBTYPE:
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *parent;
|
|
|
|
|
|
|
|
parent = find_parent_device (devices, d);
|
|
|
|
if (parent)
|
|
|
|
{
|
|
|
|
if (is_hard_drive)
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
grub_printf ("adding a hard drive by a partition: ");
|
|
|
|
grub_print_device_path (parent->device_path);
|
|
|
|
#endif
|
|
|
|
add_device (&hd_devices, parent);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
grub_printf ("adding a cdrom by a partition: ");
|
|
|
|
grub_print_device_path (parent->device_path);
|
|
|
|
#endif
|
|
|
|
add_device (&cd_devices, parent);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark the parent as used. */
|
|
|
|
parent->last_device_path = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Mark itself as used. */
|
|
|
|
d->last_device_path = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* For now, ignore the others. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Let's see what can be added more. */
|
|
|
|
for (d = devices; d; d = d->next)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *dp;
|
|
|
|
grub_efi_block_io_media_t *m;
|
|
|
|
|
|
|
|
dp = d->last_device_path;
|
|
|
|
if (! dp)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
m = d->block_io->media;
|
|
|
|
if (m->logical_partition)
|
|
|
|
{
|
|
|
|
/* Only one partition in a non-media device. Assume that this
|
|
|
|
is a floppy drive. */
|
|
|
|
#if 0
|
|
|
|
grub_printf ("adding a floppy by guessing: ");
|
|
|
|
grub_print_device_path (d->device_path);
|
|
|
|
#endif
|
|
|
|
add_device (&fd_devices, d);
|
|
|
|
}
|
|
|
|
else if (m->read_only && m->block_size > GRUB_DISK_SECTOR_SIZE)
|
|
|
|
{
|
|
|
|
/* This check is too heuristic, but assume that this is a
|
|
|
|
CDROM drive. */
|
|
|
|
#if 0
|
|
|
|
grub_printf ("adding a cdrom by guessing: ");
|
|
|
|
grub_print_device_path (d->device_path);
|
|
|
|
#endif
|
|
|
|
add_device (&cd_devices, d);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* The default is a hard drive. */
|
|
|
|
#if 0
|
|
|
|
grub_printf ("adding a hard drive by guessing: ");
|
|
|
|
grub_print_device_path (d->device_path);
|
|
|
|
#endif
|
|
|
|
add_device (&hd_devices, d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_devices (struct grub_efidisk_data *devices)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *p, *q;
|
|
|
|
|
|
|
|
for (p = devices; p; p = q)
|
|
|
|
{
|
|
|
|
q = p->next;
|
|
|
|
grub_free (p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Enumerate all disks to name devices. */
|
|
|
|
static void
|
|
|
|
enumerate_disks (void)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *devices;
|
|
|
|
|
|
|
|
devices = make_devices ();
|
|
|
|
if (! devices)
|
|
|
|
return;
|
|
|
|
|
|
|
|
name_devices (devices);
|
|
|
|
free_devices (devices);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
grub_efidisk_iterate (int (*hook) (const char *name))
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
char buf[16];
|
|
|
|
int count;
|
|
|
|
|
|
|
|
for (d = fd_devices, count = 0; d; d = d->next, count++)
|
|
|
|
{
|
|
|
|
grub_sprintf (buf, "fd%d", count);
|
|
|
|
grub_dprintf ("efidisk", "iterating %s\n", buf);
|
|
|
|
if (hook (buf))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (d = hd_devices, count = 0; d; d = d->next, count++)
|
|
|
|
{
|
|
|
|
grub_sprintf (buf, "hd%d", count);
|
|
|
|
grub_dprintf ("efidisk", "iterating %s\n", buf);
|
|
|
|
if (hook (buf))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (d = cd_devices, count = 0; d; d = d->next, count++)
|
|
|
|
{
|
|
|
|
grub_sprintf (buf, "cd%d", count);
|
|
|
|
grub_dprintf ("efidisk", "iterating %s\n", buf);
|
|
|
|
if (hook (buf))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
get_drive_number (const char *name)
|
|
|
|
{
|
|
|
|
unsigned long drive;
|
|
|
|
|
|
|
|
if ((name[0] != 'f' && name[0] != 'h' && name[0] != 'c') || name[1] != 'd')
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
drive = grub_strtoul (name + 2, 0, 10);
|
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
return (int) drive ;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a efidisk");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct grub_efidisk_data *
|
|
|
|
get_device (struct grub_efidisk_data *devices, int num)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
|
|
|
|
for (d = devices; d && num; d = d->next, num--)
|
|
|
|
;
|
|
|
|
|
|
|
|
if (num == 0)
|
|
|
|
return d;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_efidisk_open (const char *name, struct grub_disk *disk)
|
|
|
|
{
|
|
|
|
int num;
|
|
|
|
struct grub_efidisk_data *d = 0;
|
|
|
|
grub_efi_block_io_media_t *m;
|
|
|
|
|
|
|
|
grub_dprintf ("efidisk", "opening %s\n", name);
|
|
|
|
|
|
|
|
num = get_drive_number (name);
|
|
|
|
if (num < 0)
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
switch (name[0])
|
|
|
|
{
|
|
|
|
case 'f':
|
|
|
|
disk->has_partitions = 0;
|
|
|
|
d = get_device (fd_devices, num);
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
/* FIXME: a CDROM should have partitions, but not implemented yet. */
|
|
|
|
disk->has_partitions = 0;
|
|
|
|
d = get_device (cd_devices, num);
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
disk->has_partitions = 1;
|
|
|
|
d = get_device (hd_devices, num);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Never reach here. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! d)
|
|
|
|
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such device");
|
|
|
|
|
|
|
|
disk->id = ((num << 8) | name[0]);
|
|
|
|
m = d->block_io->media;
|
|
|
|
/* FIXME: Probably it is better to store the block size in the disk,
|
|
|
|
and total sectors should be replaced with total blocks. */
|
|
|
|
grub_dprintf ("efidisk", "m = %p, last block = %llx, block size = %x\n",
|
|
|
|
m, m->last_block, m->block_size);
|
|
|
|
disk->total_sectors = (m->last_block
|
|
|
|
* (m->block_size >> GRUB_DISK_SECTOR_BITS));
|
|
|
|
disk->data = d;
|
|
|
|
|
|
|
|
grub_dprintf ("efidisk", "opening %s succeeded\n", name);
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_efidisk_close (struct grub_disk *disk __attribute__ ((unused)))
|
|
|
|
{
|
|
|
|
/* EFI disks do not allocate extra memory, so nothing to do here. */
|
2006-04-30 21:09:37 +00:00
|
|
|
grub_dprintf ("efidisk", "closing %s\n", disk->name);
|
2006-04-23 13:37:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
grub_efidisk_read (struct grub_disk *disk, grub_disk_addr_t sector,
|
|
|
|
grub_size_t size, char *buf)
|
2006-04-23 13:37:36 +00:00
|
|
|
{
|
|
|
|
/* For now, use the disk io interface rather than the block io's. */
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
grub_efi_disk_io_t *dio;
|
|
|
|
grub_efi_block_io_t *bio;
|
|
|
|
grub_efi_status_t status;
|
|
|
|
|
|
|
|
d = disk->data;
|
|
|
|
dio = d->disk_io;
|
|
|
|
bio = d->block_io;
|
|
|
|
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
grub_dprintf ("efidisk",
|
|
|
|
"reading 0x%x sectors at the sector 0x%llx from %s\n",
|
2006-04-23 13:37:36 +00:00
|
|
|
size, sector, disk->name);
|
|
|
|
|
|
|
|
status = dio->read (dio, bio->media->media_id,
|
|
|
|
(grub_efi_uint64_t) sector << GRUB_DISK_SECTOR_BITS,
|
|
|
|
(grub_efi_uintn_t) size << GRUB_DISK_SECTOR_BITS,
|
|
|
|
buf);
|
|
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
|
|
return grub_error (GRUB_ERR_READ_ERROR, "efidisk read error");
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
grub_efidisk_write (struct grub_disk *disk, grub_disk_addr_t sector,
|
|
|
|
grub_size_t size, const char *buf)
|
2006-04-23 13:37:36 +00:00
|
|
|
{
|
|
|
|
/* For now, use the disk io interface rather than the block io's. */
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
grub_efi_disk_io_t *dio;
|
|
|
|
grub_efi_block_io_t *bio;
|
|
|
|
grub_efi_status_t status;
|
|
|
|
|
|
|
|
d = disk->data;
|
|
|
|
dio = d->disk_io;
|
|
|
|
bio = d->block_io;
|
|
|
|
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
grub_dprintf ("efidisk",
|
|
|
|
"writing 0x%x sectors at the sector 0x%llx to %s\n",
|
2006-04-23 13:37:36 +00:00
|
|
|
size, sector, disk->name);
|
|
|
|
|
|
|
|
status = dio->write (dio, bio->media->media_id,
|
|
|
|
(grub_efi_uint64_t) sector << GRUB_DISK_SECTOR_BITS,
|
|
|
|
(grub_efi_uintn_t) size << GRUB_DISK_SECTOR_BITS,
|
|
|
|
(void *) buf);
|
|
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
|
|
return grub_error (GRUB_ERR_WRITE_ERROR, "efidisk write error");
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct grub_disk_dev grub_efidisk_dev =
|
|
|
|
{
|
|
|
|
.name = "efidisk",
|
|
|
|
.id = GRUB_DISK_DEVICE_EFIDISK_ID,
|
|
|
|
.iterate = grub_efidisk_iterate,
|
|
|
|
.open = grub_efidisk_open,
|
|
|
|
.close = grub_efidisk_close,
|
|
|
|
.read = grub_efidisk_read,
|
|
|
|
.write = grub_efidisk_write,
|
|
|
|
.next = 0
|
|
|
|
};
|
|
|
|
|
|
|
|
void
|
|
|
|
grub_efidisk_init (void)
|
|
|
|
{
|
|
|
|
enumerate_disks ();
|
|
|
|
grub_disk_dev_register (&grub_efidisk_dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
grub_efidisk_fini (void)
|
|
|
|
{
|
|
|
|
free_devices (fd_devices);
|
|
|
|
free_devices (hd_devices);
|
|
|
|
free_devices (cd_devices);
|
|
|
|
grub_disk_dev_unregister (&grub_efidisk_dev);
|
|
|
|
}
|
2006-04-25 20:08:31 +00:00
|
|
|
|
|
|
|
/* Some utility functions to map GRUB devices with EFI devices. */
|
|
|
|
grub_efi_handle_t
|
|
|
|
grub_efidisk_get_device_handle (grub_disk_t disk)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
char type;
|
|
|
|
|
|
|
|
if (disk->dev->id != GRUB_DISK_DEVICE_EFIDISK_ID)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
d = disk->data;
|
|
|
|
type = disk->name[0];
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case 'f':
|
|
|
|
/* This is the simplest case. */
|
|
|
|
return d->handle;
|
|
|
|
|
|
|
|
case 'c':
|
|
|
|
/* FIXME: probably this is not correct. */
|
|
|
|
return d->handle;
|
|
|
|
|
|
|
|
case 'h':
|
|
|
|
/* If this is the whole disk, just return its own data. */
|
|
|
|
if (! disk->partition)
|
|
|
|
return d->handle;
|
|
|
|
|
|
|
|
/* Otherwise, we must query the corresponding device to the firmware. */
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *devices;
|
|
|
|
grub_efi_handle_t handle = 0;
|
|
|
|
auto int find_partition (struct grub_efidisk_data *c);
|
|
|
|
|
|
|
|
int find_partition (struct grub_efidisk_data *c)
|
|
|
|
{
|
|
|
|
grub_efi_hard_drive_device_path_t hd;
|
|
|
|
|
|
|
|
grub_memcpy (&hd, c->last_device_path, sizeof (hd));
|
|
|
|
|
|
|
|
if ((GRUB_EFI_DEVICE_PATH_TYPE (c->last_device_path)
|
|
|
|
== GRUB_EFI_MEDIA_DEVICE_PATH_TYPE)
|
2006-04-30 21:09:37 +00:00
|
|
|
&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (c->last_device_path)
|
2006-04-25 20:08:31 +00:00
|
|
|
== GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)
|
|
|
|
&& (grub_partition_get_start (disk->partition)
|
|
|
|
== hd.partition_start)
|
|
|
|
&& (grub_partition_get_len (disk->partition)
|
|
|
|
== hd.partition_size))
|
|
|
|
{
|
|
|
|
handle = c->handle;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
devices = make_devices ();
|
|
|
|
iterate_child_devices (devices, d, find_partition);
|
|
|
|
free_devices (devices);
|
|
|
|
|
|
|
|
if (handle != 0)
|
|
|
|
return handle;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
grub_efidisk_get_device_name (grub_efi_handle_t *handle)
|
|
|
|
{
|
|
|
|
grub_efi_device_path_t *dp, *ldp;
|
|
|
|
|
2006-04-30 21:09:37 +00:00
|
|
|
dp = grub_efi_get_device_path (handle);
|
2006-04-25 20:08:31 +00:00
|
|
|
if (! dp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ldp = find_last_device_path (dp);
|
|
|
|
if (! ldp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE
|
|
|
|
&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp)
|
|
|
|
== GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE))
|
|
|
|
{
|
|
|
|
/* This is a hard disk partition. */
|
|
|
|
grub_disk_t parent = 0;
|
|
|
|
char *partition_name = 0;
|
|
|
|
char *device_name;
|
|
|
|
grub_efi_device_path_t *dup_dp, *dup_ldp;
|
|
|
|
grub_efi_hard_drive_device_path_t hd;
|
|
|
|
auto int find_parent_disk (const char *name);
|
|
|
|
auto int find_partition (grub_disk_t disk, const grub_partition_t part);
|
|
|
|
|
|
|
|
/* Find the disk which is the parent of a given hard disk partition. */
|
|
|
|
int find_parent_disk (const char *name)
|
|
|
|
{
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
|
|
|
disk = grub_disk_open (name);
|
|
|
|
if (! disk)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (disk->dev->id == GRUB_DISK_DEVICE_EFIDISK_ID)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
|
|
|
|
d = disk->data;
|
|
|
|
if (compare_device_paths (d->device_path, dup_dp) == 0)
|
|
|
|
{
|
|
|
|
parent = disk;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_disk_close (disk);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the identical partition. */
|
|
|
|
int find_partition (grub_disk_t disk __attribute__ ((unused)),
|
|
|
|
const grub_partition_t part)
|
|
|
|
{
|
|
|
|
if (grub_partition_get_start (part) == hd.partition_start
|
|
|
|
&& grub_partition_get_len (part) == hd.partition_size)
|
|
|
|
{
|
|
|
|
partition_name = grub_partition_get_name (part);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* It is necessary to duplicate the device path so that GRUB
|
|
|
|
can overwrite it. */
|
|
|
|
dup_dp = duplicate_device_path (dp);
|
|
|
|
if (! dup_dp)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dup_ldp = find_last_device_path (dup_dp);
|
|
|
|
dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
|
|
|
|
dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
|
|
|
|
dup_ldp->length[0] = sizeof (*dup_ldp);
|
|
|
|
dup_ldp->length[1] = 0;
|
|
|
|
|
|
|
|
grub_efidisk_iterate (find_parent_disk);
|
|
|
|
grub_free (dup_dp);
|
|
|
|
|
|
|
|
if (! parent)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Find a partition which matches the hard drive device path. */
|
|
|
|
grub_memcpy (&hd, ldp, sizeof (hd));
|
|
|
|
grub_partition_iterate (parent, find_partition);
|
|
|
|
|
|
|
|
if (! partition_name)
|
|
|
|
{
|
|
|
|
grub_disk_close (parent);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
device_name = grub_malloc (grub_strlen (parent->name) + 1
|
|
|
|
+ grub_strlen (partition_name) + 1);
|
|
|
|
if (! device_name)
|
|
|
|
{
|
|
|
|
grub_free (partition_name);
|
|
|
|
grub_disk_close (parent);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_sprintf (device_name, "%s,%s", parent->name, partition_name);
|
|
|
|
grub_free (partition_name);
|
|
|
|
grub_disk_close (parent);
|
|
|
|
return device_name;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This should be an entire disk. */
|
|
|
|
auto int find_disk (const char *name);
|
|
|
|
char *device_name = 0;
|
|
|
|
|
|
|
|
int find_disk (const char *name)
|
|
|
|
{
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
|
|
|
disk = grub_disk_open (name);
|
|
|
|
if (! disk)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (disk->id == GRUB_DISK_DEVICE_EFIDISK_ID)
|
|
|
|
{
|
|
|
|
struct grub_efidisk_data *d;
|
|
|
|
|
|
|
|
d = disk->data;
|
|
|
|
if (compare_device_paths (d->device_path, dp) == 0)
|
|
|
|
{
|
|
|
|
device_name = grub_strdup (disk->name);
|
|
|
|
grub_disk_close (disk);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_disk_close (disk);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_efidisk_iterate (find_disk);
|
|
|
|
return device_name;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|