From 2d01dac95413ac3a6685f391d5689e870fdfb9a3 Mon Sep 17 00:00:00 2001 From: marck Date: Tue, 21 Jan 2014 09:22:00 +0000 Subject: [PATCH] MFC r259925-259926 (with appropriate changes to g_part_uuid_alias struct): Add GPT UUID for VMware vSAN meta-data partition. Approved by: ae git-svn-id: svn://svn.freebsd.org/base/stable/8@260982 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/geom/part/g_part.c | 1 + sys/geom/part/g_part.h | 1 + sys/geom/part/g_part_gpt.c | 2 ++ sys/sys/gpt.h | 2 ++ 4 files changed, 6 insertions(+) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 2055924f4..e6dd2819e 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -106,6 +106,7 @@ struct g_part_alias_list { { "vmware-vmfs", G_PART_ALIAS_VMFS }, { "vmware-vmkdiag", G_PART_ALIAS_VMKDIAG }, { "vmware-reserved", G_PART_ALIAS_VMRESERVED }, + { "vmware-vsanhdr", G_PART_ALIAS_VMVSANHDR }, }; SYSCTL_DECL(_kern_geom); diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index e475a3e72..d175e3411 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -72,6 +72,7 @@ enum g_part_alias { G_PART_ALIAS_VMFS, /* A VMware VMFS partition entry */ G_PART_ALIAS_VMKDIAG, /* A VMware vmkDiagnostic partition entry */ G_PART_ALIAS_VMRESERVED, /* A VMware reserved partition entry */ + G_PART_ALIAS_VMVSANHDR, /* A VMware vSAN header partition entry */ /* Keep the following last */ G_PART_ALIAS_COUNT }; diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 9425333b4..dfed05135 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -162,6 +162,7 @@ static struct uuid gpt_uuid_linux_swap = GPT_ENT_TYPE_LINUX_SWAP; static struct uuid gpt_uuid_vmfs = GPT_ENT_TYPE_VMFS; static struct uuid gpt_uuid_vmkdiag = GPT_ENT_TYPE_VMKDIAG; static struct uuid gpt_uuid_vmreserved = GPT_ENT_TYPE_VMRESERVED; +static struct uuid gpt_uuid_vmvsanhdr = GPT_ENT_TYPE_VMVSANHDR; static struct uuid gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA; static struct uuid gpt_uuid_ms_reserved = GPT_ENT_TYPE_MS_RESERVED; static struct uuid gpt_uuid_ms_ldm_data = GPT_ENT_TYPE_MS_LDM_DATA; @@ -201,6 +202,7 @@ static struct g_part_uuid_alias { { &gpt_uuid_vmfs, G_PART_ALIAS_VMFS }, { &gpt_uuid_vmkdiag, G_PART_ALIAS_VMKDIAG }, { &gpt_uuid_vmreserved, G_PART_ALIAS_VMRESERVED }, + { &gpt_uuid_vmvsanhdr, G_PART_ALIAS_VMVSANHDR }, { &gpt_uuid_mbr, G_PART_ALIAS_MBR }, { &gpt_uuid_ms_basic_data, G_PART_ALIAS_MS_BASIC_DATA }, { &gpt_uuid_ms_ldm_data, G_PART_ALIAS_MS_LDM_DATA }, diff --git a/sys/sys/gpt.h b/sys/sys/gpt.h index d00135dee..e31b47361 100644 --- a/sys/sys/gpt.h +++ b/sys/sys/gpt.h @@ -126,6 +126,8 @@ struct gpt_ent { {0x9d275380,0x40ad,0x11db,0xbf,0x97,{0x00,0x0c,0x29,0x11,0xd1,0xb8}} #define GPT_ENT_TYPE_VMRESERVED \ {0x9198effc,0x31c0,0x11db,0x8f,0x78,{0x00,0x0c,0x29,0x11,0xd1,0xb8}} +#define GPT_ENT_TYPE_VMVSANHDR \ + {0x381cfccc,0x7288,0x11e0,0x92,0xee,{0x00,0x0c,0x29,0x11,0xd0,0xb2}} #define GPT_ENT_TYPE_APPLE_BOOT \ {0x426F6F74,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}} -- 2.45.0