Index: common/lib/libutil/getfstypename.c
===================================================================
RCS file: /cvsroot/src/common/lib/libutil/getfstypename.c,v
retrieving revision 1.8
diff -p -u -r1.8 getfstypename.c
--- common/lib/libutil/getfstypename.c	7 Apr 2012 16:28:59 -0000	1.8
+++ common/lib/libutil/getfstypename.c	5 Nov 2018 00:40:59 -0000
@@ -123,6 +123,12 @@ getfstypename(int fstype)
 		return DKW_PTYPE_UNKNOWN;
 	case FS_MINIXFS3:
 		return DKW_PTYPE_MINIXFS3;
+	case FS_VMKCORE:
+		return DKW_PTYPE_VMKCORE;
+	case FS_VMFS:
+		return DKW_PTYPE_VMFS;
+	case FS_VMWRESV:
+		return DKW_PTYPE_VMWRESV;
 	}
 	/* Stupid gcc, should know it is impossible to get here */
 	/*NOTREACHED*/
Index: sbin/gpt/gpt_uuid.c
===================================================================
RCS file: /cvsroot/src/sbin/gpt/gpt_uuid.c,v
retrieving revision 1.15
diff -p -u -r1.15 gpt_uuid.c
--- sbin/gpt/gpt_uuid.c	16 Feb 2017 22:40:19 -0000	1.15
+++ sbin/gpt/gpt_uuid.c	5 Nov 2018 00:40:59 -0000
@@ -87,6 +87,9 @@ static const struct {
 	{ GPT_ENT_TYPE_NETBSD_RAIDFRAME, "raid",
 	    "NetBSD RAIDFrame component" },
 	{ GPT_ENT_TYPE_NETBSD_SWAP, "swap", "NetBSD swap" },
+	{ GPT_ENT_TYPE_VMWARE_VMKCORE, "swap", "VMware VMkernel core dump" },
+	{ GPT_ENT_TYPE_VMWARE_VMFS, "swap", "VMware VMFS" },
+	{ GPT_ENT_TYPE_VMWARE_RESERVED, "swap", "VMware reserved" },
 };
 
 static void
Index: sys/dev/dkwedge/dkwedge_gpt.c
===================================================================
RCS file: /cvsroot/src/sys/dev/dkwedge/dkwedge_gpt.c,v
retrieving revision 1.20
diff -p -u -r1.20 dkwedge_gpt.c
--- sys/dev/dkwedge/dkwedge_gpt.c	7 Sep 2017 10:18:26 -0000	1.20
+++ sys/dev/dkwedge/dkwedge_gpt.c	5 Nov 2018 00:40:59 -0000
@@ -73,6 +73,9 @@ static const struct {
 	{ GPT_ENT_TYPE_NETBSD_CCD,		DKW_PTYPE_CCD },
 	{ GPT_ENT_TYPE_NETBSD_CGD,		DKW_PTYPE_CGD },
 	{ GPT_ENT_TYPE_APPLE_HFS,		DKW_PTYPE_APPLEHFS },
+	{ GPT_ENT_TYPE_VMWARE_VMKCORE,		DKW_PTYPE_VMKCORE },
+	{ GPT_ENT_TYPE_VMWARE_VMFS,		DKW_PTYPE_VMFS },
+	{ GPT_ENT_TYPE_VMWARE_RESERVED,		DKW_PTYPE_VMWRESV },
 };
 
 static const char *
Index: sys/sys/disk.h
===================================================================
RCS file: /cvsroot/src/sys/sys/disk.h,v
retrieving revision 1.72
diff -p -u -r1.72 disk.h
--- sys/sys/disk.h	13 Jun 2017 14:05:47 -0000	1.72
+++ sys/sys/disk.h	5 Nov 2018 00:40:59 -0000
@@ -208,6 +208,9 @@ struct dkwedge_list {
 #define	DKW_PTYPE_NILFS		"nilfs"
 #define	DKW_PTYPE_CGD		"cgd"
 #define	DKW_PTYPE_MINIXFS3	"minixfs3"
+#define	DKW_PTYPE_VMKCORE	"vmkcore"
+#define	DKW_PTYPE_VMFS		"vmfs"
+#define	DKW_PTYPE_VMWRESV	"vmwresv"
 
 /*
  * Ensure each symbol used in FSTYPE_DEFN in <sys/disklabel.h>
Index: sys/sys/disklabel.h
===================================================================
RCS file: /cvsroot/src/sys/sys/disklabel.h,v
retrieving revision 1.119
diff -p -u -r1.119 disklabel.h
--- sys/sys/disklabel.h	8 Dec 2015 20:36:15 -0000	1.119
+++ sys/sys/disklabel.h	5 Nov 2018 00:40:59 -0000
@@ -361,7 +361,10 @@ x(SYSVBFS, 25, "SysVBFS",    NULL,  "sys
 x(EFS,     26, "EFS",        NULL,   "efs")   /* SGI's Extent Filesystem */ \
 x(NILFS,   27, "NiLFS",      NULL,   "nilfs") /* NTT's NiLFS(2) */ \
 x(CGD,     28, "cgd",	     NULL,   NULL)    /* Cryptographic disk */ \
-x(MINIXFS3,29, "MINIX FSv3", NULL,   NULL)    /* MINIX file system v3 */
+x(MINIXFS3,29, "MINIX FSv3", NULL,   NULL)    /* MINIX file system v3 */ \
+x(VMKCORE, 30, "VMware vmkcore", NULL, NULL)  /* VMware vmkcore */ \
+x(VMFS,    31, "VMware VMFS", NULL,  NULL)    /* VMware VMFS */ \
+x(VMWRESV, 32, "VMware Reserved", NULL, NULL) /* VMware reserved */
 
 
 #ifndef _LOCORE
Index: sys/sys/disklabel_gpt.h
===================================================================
RCS file: /cvsroot/src/sys/sys/disklabel_gpt.h,v
retrieving revision 1.12
diff -p -u -r1.12 disklabel_gpt.h
--- sys/sys/disklabel_gpt.h	24 Nov 2013 08:17:50 -0000	1.12
+++ sys/sys/disklabel_gpt.h	5 Nov 2018 00:40:59 -0000
@@ -176,4 +176,14 @@ struct gpt_ent {
 #define	GPT_ENT_TYPE_BIOS		\
 	{0x21686148,0x6449,0x6e6f,0x74,0x4e,{0x65,0x65,0x64,0x45,0x46,0x49}}
 
+/*
+ * VMware types.
+ */
+#define	GPT_ENT_TYPE_VMWARE_VMKCORE	\
+	{0x9D275380,0x40AD,0x11DB,0xBF,0x97,{0x00,0x0C,0x29,0x11,0xD1,0xB8}}
+#define	GPT_ENT_TYPE_VMWARE_VMFS	\
+	{0xAA31E02A,0x400F,0x11DB,0x95,0x90,{0x00,0x0C,0x29,0x11,0xD1,0xB8}}
+#define	GPT_ENT_TYPE_VMWARE_RESERVED	\
+	{0x9198EFFC,0x31C0,0x11DB,0x8F,0x78,{0x00,0x0C,0x29,0x11,0xD1,0xB8}}
+
 #endif /* _SYS_DISKLABEL_GPT_H_ */