svn commit: r208450 - in stable/8/sys: geom/part sys
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Sun May 23 15:30:32 UTC 2010
Author: nwhitehorn
Date: Sun May 23 15:30:32 2010
New Revision: 208450
URL: http://svn.freebsd.org/changeset/base/208450
Log:
MFC r200534,200535:
Simplify partition type parsing by using a data-oriented model.
While there add more Apple and Linux partition types.
This unbreaks the build after r208341.
Reported by: many
Pointy hat to: me
Modified:
stable/8/sys/geom/part/g_part.c
stable/8/sys/geom/part/g_part.h
stable/8/sys/geom/part/g_part_gpt.c
stable/8/sys/sys/gpt.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/geom/part/g_part.c
==============================================================================
--- stable/8/sys/geom/part/g_part.c Sun May 23 14:11:27 2010 (r208449)
+++ stable/8/sys/geom/part/g_part.c Sun May 23 15:30:32 2010 (r208450)
@@ -69,7 +69,13 @@ struct g_part_alias_list {
const char *lexeme;
enum g_part_alias alias;
} g_part_alias_list[G_PART_ALIAS_COUNT] = {
+ { "apple-boot", G_PART_ALIAS_APPLE_BOOT },
{ "apple-hfs", G_PART_ALIAS_APPLE_HFS },
+ { "apple-label", G_PART_ALIAS_APPLE_LABEL },
+ { "apple-raid", G_PART_ALIAS_APPLE_RAID },
+ { "apple-raid-offline", G_PART_ALIAS_APPLE_RAID_OFFLINE },
+ { "apple-tv-recovery", G_PART_ALIAS_APPLE_TV_RECOVERY },
+ { "apple-ufs", G_PART_ALIAS_APPLE_UFS },
{ "efi", G_PART_ALIAS_EFI },
{ "freebsd", G_PART_ALIAS_FREEBSD },
{ "freebsd-boot", G_PART_ALIAS_FREEBSD_BOOT },
@@ -77,6 +83,10 @@ struct g_part_alias_list {
{ "freebsd-ufs", G_PART_ALIAS_FREEBSD_UFS },
{ "freebsd-vinum", G_PART_ALIAS_FREEBSD_VINUM },
{ "freebsd-zfs", G_PART_ALIAS_FREEBSD_ZFS },
+ { "linux-data", G_PART_ALIAS_LINUX_DATA },
+ { "linux-lvm", G_PART_ALIAS_LINUX_LVM },
+ { "linux-raid", G_PART_ALIAS_LINUX_RAID },
+ { "linux-swap", G_PART_ALIAS_LINUX_SWAP },
{ "mbr", G_PART_ALIAS_MBR }
};
Modified: stable/8/sys/geom/part/g_part.h
==============================================================================
--- stable/8/sys/geom/part/g_part.h Sun May 23 14:11:27 2010 (r208449)
+++ stable/8/sys/geom/part/g_part.h Sun May 23 15:30:32 2010 (r208450)
@@ -36,7 +36,13 @@
#define G_PART_PROBE_PRI_HIGH 0
enum g_part_alias {
- G_PART_ALIAS_APPLE_HFS, /* An HFS file system entry. */
+ G_PART_ALIAS_APPLE_BOOT, /* An Apple boot partition entry. */
+ G_PART_ALIAS_APPLE_HFS, /* An HFS+ file system entry. */
+ G_PART_ALIAS_APPLE_LABEL, /* An Apple label partition entry. */
+ G_PART_ALIAS_APPLE_RAID, /* An Apple RAID partition entry. */
+ G_PART_ALIAS_APPLE_RAID_OFFLINE,/* An Apple RAID (offline) part entry.*/
+ G_PART_ALIAS_APPLE_TV_RECOVERY, /* An Apple TV recovery part entry. */
+ G_PART_ALIAS_APPLE_UFS, /* An Apple UFS partition entry. */
G_PART_ALIAS_EFI, /* A EFI system partition entry. */
G_PART_ALIAS_FREEBSD, /* A BSD labeled partition entry. */
G_PART_ALIAS_FREEBSD_BOOT, /* A FreeBSD boot partition entry. */
@@ -45,6 +51,10 @@ enum g_part_alias {
G_PART_ALIAS_FREEBSD_VINUM, /* A Vinum partition entry. */
G_PART_ALIAS_FREEBSD_ZFS, /* A ZFS file system entry. */
G_PART_ALIAS_MBR, /* A MBR (extended) partition entry. */
+ G_PART_ALIAS_LINUX_DATA, /* A Linux data partition entry. */
+ G_PART_ALIAS_LINUX_LVM, /* A Linux LVM partition entry. */
+ G_PART_ALIAS_LINUX_RAID, /* A Linux RAID partition entry. */
+ G_PART_ALIAS_LINUX_SWAP, /* A Linux swap partition entry. */
/* Keep the following last */
G_PART_ALIAS_COUNT
};
Modified: stable/8/sys/geom/part/g_part_gpt.c
==============================================================================
--- stable/8/sys/geom/part/g_part_gpt.c Sun May 23 14:11:27 2010 (r208449)
+++ stable/8/sys/geom/part/g_part_gpt.c Sun May 23 15:30:32 2010 (r208450)
@@ -131,7 +131,13 @@ static struct g_part_scheme g_part_gpt_s
};
G_PART_SCHEME_DECLARE(g_part_gpt);
+static struct uuid gpt_uuid_apple_boot = GPT_ENT_TYPE_APPLE_BOOT;
static struct uuid gpt_uuid_apple_hfs = GPT_ENT_TYPE_APPLE_HFS;
+static struct uuid gpt_uuid_apple_label = GPT_ENT_TYPE_APPLE_LABEL;
+static struct uuid gpt_uuid_apple_raid = GPT_ENT_TYPE_APPLE_RAID;
+static struct uuid gpt_uuid_apple_raid_offline = GPT_ENT_TYPE_APPLE_RAID_OFFLINE;
+static struct uuid gpt_uuid_apple_tv_recovery = GPT_ENT_TYPE_APPLE_TV_RECOVERY;
+static struct uuid gpt_uuid_apple_ufs = GPT_ENT_TYPE_APPLE_UFS;
static struct uuid gpt_uuid_efi = GPT_ENT_TYPE_EFI;
static struct uuid gpt_uuid_freebsd = GPT_ENT_TYPE_FREEBSD;
static struct uuid gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;
@@ -139,10 +145,39 @@ static struct uuid gpt_uuid_freebsd_swap
static struct uuid gpt_uuid_freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS;
static struct uuid gpt_uuid_freebsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
static struct uuid gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
+static struct uuid gpt_uuid_linux_data = GPT_ENT_TYPE_LINUX_DATA;
+static struct uuid gpt_uuid_linux_lvm = GPT_ENT_TYPE_LINUX_LVM;
+static struct uuid gpt_uuid_linux_raid = GPT_ENT_TYPE_LINUX_RAID;
static struct uuid gpt_uuid_linux_swap = GPT_ENT_TYPE_LINUX_SWAP;
static struct uuid gpt_uuid_mbr = GPT_ENT_TYPE_MBR;
static struct uuid gpt_uuid_unused = GPT_ENT_TYPE_UNUSED;
+static struct g_part_uuid_alias {
+ struct uuid *uuid;
+ int alias;
+} gpt_uuid_alias_match[] = {
+ { &gpt_uuid_apple_boot, G_PART_ALIAS_APPLE_BOOT },
+ { &gpt_uuid_apple_hfs, G_PART_ALIAS_APPLE_HFS },
+ { &gpt_uuid_apple_label, G_PART_ALIAS_APPLE_LABEL },
+ { &gpt_uuid_apple_raid, G_PART_ALIAS_APPLE_RAID },
+ { &gpt_uuid_apple_raid_offline, G_PART_ALIAS_APPLE_RAID_OFFLINE },
+ { &gpt_uuid_apple_tv_recovery, G_PART_ALIAS_APPLE_TV_RECOVERY },
+ { &gpt_uuid_apple_ufs, G_PART_ALIAS_APPLE_UFS },
+ { &gpt_uuid_efi, G_PART_ALIAS_EFI },
+ { &gpt_uuid_freebsd, G_PART_ALIAS_FREEBSD },
+ { &gpt_uuid_freebsd_boot, G_PART_ALIAS_FREEBSD_BOOT },
+ { &gpt_uuid_freebsd_swap, G_PART_ALIAS_FREEBSD_SWAP },
+ { &gpt_uuid_freebsd_ufs, G_PART_ALIAS_FREEBSD_UFS },
+ { &gpt_uuid_freebsd_vinum, G_PART_ALIAS_FREEBSD_VINUM },
+ { &gpt_uuid_freebsd_zfs, G_PART_ALIAS_FREEBSD_ZFS },
+ { &gpt_uuid_linux_data, G_PART_ALIAS_LINUX_DATA },
+ { &gpt_uuid_linux_lvm, G_PART_ALIAS_LINUX_LVM },
+ { &gpt_uuid_linux_raid, G_PART_ALIAS_LINUX_RAID },
+ { &gpt_uuid_linux_swap, G_PART_ALIAS_LINUX_SWAP },
+ { &gpt_uuid_mbr, G_PART_ALIAS_MBR },
+ { NULL, 0 }
+};
+
static struct gpt_hdr *
gpt_read_hdr(struct g_part_gpt_table *table, struct g_consumer *cp,
enum gpt_elt elt)
@@ -305,6 +340,7 @@ gpt_parse_type(const char *type, struct
struct uuid tmp;
const char *alias;
int error;
+ struct g_part_uuid_alias *uap;
if (type[0] == '!') {
error = parse_uuid(type + 1, &tmp);
@@ -315,50 +351,12 @@ gpt_parse_type(const char *type, struct
*uuid = tmp;
return (0);
}
- alias = g_part_alias_name(G_PART_ALIAS_EFI);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_efi;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_FREEBSD);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_freebsd;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_BOOT);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_freebsd_boot;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_SWAP);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_freebsd_swap;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_UFS);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_freebsd_ufs;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_VINUM);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_freebsd_vinum;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_ZFS);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_freebsd_zfs;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_MBR);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_mbr;
- return (0);
- }
- alias = g_part_alias_name(G_PART_ALIAS_APPLE_HFS);
- if (!strcasecmp(type, alias)) {
- *uuid = gpt_uuid_apple_hfs;
- return (0);
+ for (uap = &gpt_uuid_alias_match[0]; uap->uuid; uap++) {
+ alias = g_part_alias_name(uap->alias);
+ if (!strcasecmp(type, alias)) {
+ uuid = uap->uuid;
+ return (0);
+ }
}
return (EINVAL);
}
@@ -717,29 +715,16 @@ g_part_gpt_type(struct g_part_table *bas
{
struct g_part_gpt_entry *entry;
struct uuid *type;
+ struct g_part_uuid_alias *uap;
entry = (struct g_part_gpt_entry *)baseentry;
type = &entry->ent.ent_type;
- if (EQUUID(type, &gpt_uuid_efi))
- return (g_part_alias_name(G_PART_ALIAS_EFI));
- if (EQUUID(type, &gpt_uuid_freebsd))
- return (g_part_alias_name(G_PART_ALIAS_FREEBSD));
- if (EQUUID(type, &gpt_uuid_freebsd_boot))
- return (g_part_alias_name(G_PART_ALIAS_FREEBSD_BOOT));
- if (EQUUID(type, &gpt_uuid_freebsd_swap))
- return (g_part_alias_name(G_PART_ALIAS_FREEBSD_SWAP));
- if (EQUUID(type, &gpt_uuid_freebsd_ufs))
- return (g_part_alias_name(G_PART_ALIAS_FREEBSD_UFS));
- if (EQUUID(type, &gpt_uuid_freebsd_vinum))
- return (g_part_alias_name(G_PART_ALIAS_FREEBSD_VINUM));
- if (EQUUID(type, &gpt_uuid_freebsd_zfs))
- return (g_part_alias_name(G_PART_ALIAS_FREEBSD_ZFS));
- if (EQUUID(type, &gpt_uuid_mbr))
- return (g_part_alias_name(G_PART_ALIAS_MBR));
- if (EQUUID(type, &gpt_uuid_apple_hfs))
- return (g_part_alias_name(G_PART_ALIAS_APPLE_HFS));
+ for (uap = &gpt_uuid_alias_match[0]; uap->uuid; uap++)
+ if (EQUUID(type, uap->uuid))
+ return (g_part_alias_name(uap->alias));
buf[0] = '!';
snprintf_uuid(buf + 1, bufsz - 1, type);
+
return (buf);
}
Modified: stable/8/sys/sys/gpt.h
==============================================================================
--- stable/8/sys/sys/gpt.h Sun May 23 14:11:27 2010 (r208449)
+++ stable/8/sys/sys/gpt.h Sun May 23 15:30:32 2010 (r208450)
@@ -117,6 +117,8 @@ struct gpt_ent {
#define GPT_ENT_TYPE_LINUX_LVM \
{0xe6d6d379,0xf507,0x44c2,0xa2,0x3c,{0x23,0x8f,0x2a,0x3d,0xf9,0x28}}
+#define GPT_ENT_TYPE_APPLE_BOOT \
+ {0x426F6F74,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
#define GPT_ENT_TYPE_APPLE_HFS \
{0x48465300,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
#define GPT_ENT_TYPE_APPLE_UFS \
@@ -127,6 +129,10 @@ struct gpt_ent {
{0x52414944,0x0000,0x11aa,0xaa,0x22,{0x00,0x30,0x65,0x43,0xec,0xac}}
#define GPT_ENT_TYPE_APPLE_RAID_OFFLINE \
{0x52414944,0x5f4f,0x11aa,0xaa,0x22,{0x00,0x30,0x65,0x43,0xec,0xac}}
+#define GPT_ENT_TYPE_APPLE_LABEL \
+ {0x4C616265,0x6c00,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
+#define GPT_ENT_TYPE_APPLE_TV_RECOVERY \
+ {0x5265636f,0x7665,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
#define GPT_ENT_TYPE_NETBSD_FFS \
{0x49f48d5a,0xb10e,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
More information about the svn-src-stable
mailing list