96 lines
3.4 KiB
Diff
96 lines
3.4 KiB
Diff
From a16f4a822fb528944b5dd008f97e37e0ed19a515 Mon Sep 17 00:00:00 2001
|
|
From: Nicholas Vinson <nvinson234@gmail.com>
|
|
Date: Mon, 16 Apr 2018 22:36:24 -0700
|
|
Subject: [PATCH] disk: Update grub_gpt_partentry
|
|
|
|
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>
|
|
---
|
|
grub-core/disk/ldm.c | 2 +-
|
|
grub-core/partmap/gpt.c | 4 ++--
|
|
util/grub-install.c | 2 +-
|
|
include/grub/gpt_partition.h | 8 ++++----
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
|
|
index 0f978ad0507..2a22d2d6c1c 100644
|
|
--- a/grub-core/disk/ldm.c
|
|
+++ b/grub-core/disk/ldm.c
|
|
@@ -135,7 +135,7 @@ msdos_has_ldm_partition (grub_disk_t dsk)
|
|
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. */
|
|
static int
|
|
diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
|
|
index 83bcba77914..103f6796f39 100644
|
|
--- a/grub-core/partmap/gpt.c
|
|
+++ b/grub-core/partmap/gpt.c
|
|
@@ -33,10 +33,10 @@ static grub_uint8_t grub_gpt_magic[8] =
|
|
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
|
|
-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
|
|
|
|
/* 512 << 7 = 65536 byte sectors. */
|
|
diff --git a/util/grub-install.c b/util/grub-install.c
|
|
index 690f180c5f6..78d0138cb0a 100644
|
|
--- a/util/grub-install.c
|
|
+++ b/util/grub-install.c
|
|
@@ -714,7 +714,7 @@ is_prep_partition (grub_device_t dev)
|
|
if (grub_disk_read (dev->disk, p->offset, p->index,
|
|
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_le16_compile_time (0xc612),
|
|
grub_cpu_to_le16_compile_time (0x4316),
|
|
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
|
|
index 9668a68c30a..7a93f43291c 100644
|
|
--- a/include/grub/gpt_partition.h
|
|
+++ b/include/grub/gpt_partition.h
|
|
@@ -22,14 +22,14 @@
|
|
#include <grub/types.h>
|
|
#include <grub/partition.h>
|
|
|
|
-struct grub_gpt_part_type
|
|
+struct grub_gpt_part_guid
|
|
{
|
|
grub_uint32_t data1;
|
|
grub_uint16_t data2;
|
|
grub_uint16_t data3;
|
|
grub_uint8_t data4[8];
|
|
} 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 \
|
|
{ 0x0, 0x0, 0x0, \
|
|
@@ -70,8 +70,8 @@ struct grub_gpt_header
|
|
|
|
struct grub_gpt_partentry
|
|
{
|
|
- grub_gpt_part_type_t type;
|
|
- grub_uint8_t guid[16];
|
|
+ grub_gpt_part_guid_t type;
|
|
+ grub_gpt_part_guid_t guid;
|
|
grub_uint64_t start;
|
|
grub_uint64_t end;
|
|
grub_uint64_t attrib;
|