vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

disk: Update grub_gpt_partentry

Browse source 
Rename grub_gpt_part_type to grub_gpt_part_guid and update grub_gpt_partentry
to use this type for both the partition type GUID string and the partition GUID
string entries.  This change ensures that the two GUID fields are handled more
consistently and helps to simplify the changes needed to add Linux partition
GUID support.

Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Nicholas Vinson 2018-04-16 22:36:24 -07:00 committed by Daniel Kiper
parent c2b86ae1fc
commit a16f4a822f
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/disk/ldm.c
View file

@ -135,7 +135,7 @@ msdos_has_ldm_partition (grub_disk_t dsk)
return has_ldm; return has_ldm;
} }
static const grub_gpt_part_type_t ldm_type = GRUB_GPT_PARTITION_TYPE_LDM; static const grub_gpt_part_guid_t ldm_type = GRUB_GPT_PARTITION_TYPE_LDM;
/* Helper for gpt_ldm_sector. */ /* Helper for gpt_ldm_sector. */
static int static int

4
grub-core/partmap/gpt.c
View file

@ -33,10 +33,10 @@ static grub_uint8_t grub_gpt_magic[8] =
0x45, 0x46, 0x49, 0x20, 0x50, 0x41, 0x52, 0x54 0x45, 0x46, 0x49, 0x20, 0x50, 0x41, 0x52, 0x54
}; };
static const grub_gpt_part_type_t grub_gpt_partition_type_empty = GRUB_GPT_PARTITION_TYPE_EMPTY; static const grub_gpt_part_guid_t grub_gpt_partition_type_empty = GRUB_GPT_PARTITION_TYPE_EMPTY;
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT; static const grub_gpt_part_guid_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
#endif #endif
/* 512 << 7 = 65536 byte sectors. */ /* 512 << 7 = 65536 byte sectors. */

8
include/grub/gpt_partition.h
View file

@ -22,14 +22,14 @@
#include <grub/types.h> #include <grub/types.h>
#include <grub/partition.h> #include <grub/partition.h>
struct grub_gpt_part_type struct grub_gpt_part_guid
{ {
grub_uint32_t data1; grub_uint32_t data1;
grub_uint16_t data2; grub_uint16_t data2;
grub_uint16_t data3; grub_uint16_t data3;
grub_uint8_t data4[8]; grub_uint8_t data4[8];
} GRUB_PACKED; } GRUB_PACKED;
typedef struct grub_gpt_part_type grub_gpt_part_type_t; typedef struct grub_gpt_part_guid grub_gpt_part_guid_t;
#define GRUB_GPT_PARTITION_TYPE_EMPTY \ #define GRUB_GPT_PARTITION_TYPE_EMPTY \
{ 0x0, 0x0, 0x0, \ { 0x0, 0x0, 0x0, \
@ -70,8 +70,8 @@ struct grub_gpt_header
struct grub_gpt_partentry struct grub_gpt_partentry
{ {
grub_gpt_part_type_t type; grub_gpt_part_guid_t type;
grub_uint8_t guid[16]; grub_gpt_part_guid_t guid;
grub_uint64_t start; grub_uint64_t start;
grub_uint64_t end; grub_uint64_t end;
grub_uint64_t attrib; grub_uint64_t attrib;

2
util/grub-install.c
View file

@ -714,7 +714,7 @@ is_prep_partition (grub_device_t dev)
if (grub_disk_read (dev->disk, p->offset, p->index, if (grub_disk_read (dev->disk, p->offset, p->index,
sizeof (gptdata), &gptdata) == 0) sizeof (gptdata), &gptdata) == 0)
{ {
const grub_gpt_part_type_t template = { const grub_gpt_part_guid_t template = {
grub_cpu_to_le32_compile_time (0x9e1a2d38), grub_cpu_to_le32_compile_time (0x9e1a2d38),
grub_cpu_to_le16_compile_time (0xc612), grub_cpu_to_le16_compile_time (0xc612),
grub_cpu_to_le16_compile_time (0x4316), grub_cpu_to_le16_compile_time (0x4316),