--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/common/util/memset.h	Tue Sep 18 15:46:43 2007 -0700
@@ -0,0 +1,44 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_COMMON_UTIL_MEMSET_H
+#define	_COMMON_UTIL_MEMSET_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void *memset(void *, int, size_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _COMMON_UTIL_MEMSET_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/uts/common/krtld/mapfile	Tue Sep 18 15:46:43 2007 -0700
@@ -0,0 +1,74 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+{
+	global:
+		kobj_addrcheck;
+		kobj_alloc;
+		kobj_boot_mod_lookup;
+		kobj_boot_unmountroot;
+		kobj_close;
+		kobj_close_file;
+		kobj_export_module;
+		kobj_filbuf;
+		kobj_free;
+		kobj_fstat;
+		kobj_get_filesize;
+		kobj_getelfsym;
+		kobj_getmodinfo;
+		kobj_getpagesize;
+		kobj_getsymname;
+		kobj_getsymvalue;
+		kobj_load_module;
+		kobj_load_primary_module;
+		kobj_lookup;
+		kobj_lookup_all;
+		kobj_notify_add;
+		kobj_notify_remove;
+		kobj_open;
+		kobj_open_file;
+		kobj_path_exists;
+		kobj_open_path;
+		kobj_read;
+		kobj_read_file;
+		kobj_searchsym;
+		kobj_set_ctf;
+		kobj_stat_get;
+		kobj_sync;
+		kobj_sync_instruction_memory;
+		kobj_textwin_alloc;
+		kobj_textwin_free;
+		kobj_unload_module;
+		kobj_zalloc;
+		kobj_kdi;
+		kobj_linkmaps;
+		__tnf_tag_list_head;
+		__tnf_probe_list_head;
+		tnf_changed_probe_list;
+		boot_cpu_compatible_list;
+	local:
+		*;
+};

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/uts/i86pc/boot/boot_keyboard.h	Tue Sep 18 15:46:43 2007 -0700
@@ -0,0 +1,46 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _BOOT_KEYBOARD_H
+#define	_BOOT_KEYBOARD_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * Interfaces to the simple keyboard driver.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int kb_ischar(void);
+char kb_getchar(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _BOOT_KEYBOARD_H */

--- a/usr/src/Makefile.lint	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/Makefile.lint	Tue Sep 18 15:46:43 2007 -0700
@@ -101,6 +101,7 @@
 	cmd/devfsadm \
 	cmd/devinfo \
 	cmd/devmgmt \
+	cmd/devprop \
 	cmd/dfs.cmds \
 	cmd/diff3 \
 	cmd/dis \
@@ -273,6 +274,7 @@
 	cmd/utmp_update \
 	cmd/utmpd \
 	cmd/valtools \
+	cmd/vna \
 	cmd/wall \
 	cmd/wbem \
 	cmd/wc \

--- a/usr/src/cmd/Makefile	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/Makefile	Tue Sep 18 15:46:43 2007 -0700
@@ -122,6 +122,7 @@
 	devctl		\
 	devinfo		\
 	devmgmt		\
+	devprop		\
 	dfs.cmds	\
 	diff		\
 	diff3		\
@@ -405,6 +406,7 @@
 	valtools	\
 	vgrind		\
 	vi		\
+	vna		\
 	volcheck	\
 	volrmmount	\
 	w		\

--- a/usr/src/cmd/boot/bootadm/bootadm.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/boot/bootadm/bootadm.c	Tue Sep 18 15:46:43 2007 -0700
@@ -2402,6 +2402,22 @@
 }
 
 /*
+ * Check whether cmd matches the one indexed by which, and whether arg matches
+ * str.  which must be either KERNEL_CMD or MODULE_CMD, and a match to the
+ * respective *_DOLLAR_CMD is also acceptable.  The arg is searched using
+ * strstr(), so it can be a partial match.
+ */
+static int
+check_cmd(const char *cmd, const int which, const char *arg, const char *str)
+{
+	if ((strcmp(cmd, menu_cmds[which]) != 0) &&
+	    (strcmp(cmd, menu_cmds[which + 1]) != 0)) {
+		return (0);
+	}
+	return (strstr(arg, str) != NULL);
+}
+
+/*
  * A line in menu.lst looks like
  * [ ]*<cmd>[ \t=]*<arg>*
  */
@@ -2529,10 +2545,11 @@
 				 * We only compare for the length of "module"
 				 * so that "module$" will also match.
 				 */
-				if ((strncmp(cmd, menu_cmds[MODULE_CMD],
-				    strlen(menu_cmds[MODULE_CMD])) == 0) &&
-				    (strcmp(arg, MINIROOT) == 0))
+				if (check_cmd(cmd, MODULE_CMD, arg, MINIROOT))
 					curr_ent->flags |= BAM_ENTRY_MINIROOT;
+				else if (check_cmd(cmd, KERNEL_CMD, arg,
+				    "xen.gz"))
+					curr_ent->flags |= BAM_ENTRY_HV;
 				else if (strcmp(cmd, menu_cmds[ROOT_CMD]) == 0)
 					curr_ent->flags |= BAM_ENTRY_ROOT;
 				else if (strcmp(cmd,
@@ -2819,11 +2836,12 @@
 	return (BAM_SUCCESS);
 }
 
-static int
+int
 add_boot_entry(menu_t *mp,
 	char *title,
 	char *root,
 	char *kernel,
+	char *mod_kernel,
 	char *module)
 {
 	int lineNum, entryNum;
@@ -2902,6 +2920,12 @@
 	    menu_cmds[k_cmd], menu_cmds[SEP_CMD], kernel);
 	line_parser(mp, linebuf, &lineNum, &entryNum);
 
+	if (mod_kernel != NULL) {
+		(void) snprintf(linebuf, sizeof (linebuf), "%s%s%s",
+		    menu_cmds[m_cmd], menu_cmds[SEP_CMD], mod_kernel);
+		line_parser(mp, linebuf, &lineNum, &entryNum);
+	}
+
 	(void) snprintf(linebuf, sizeof (linebuf), "%s%s%s",
 	    menu_cmds[m_cmd], menu_cmds[SEP_CMD], module);
 	line_parser(mp, linebuf, &lineNum, &entryNum);
@@ -3204,13 +3228,12 @@
  * look for matching bootadm entry with specified parameters
  * Here are the rules (based on existing usage):
  * - If title is specified, match on title only
- * - Else, match on grubdisk and module (don't care about kernel line).
- *   note that, if root_opt is non-zero, the absence of root line is
- *   considered a match.
+ * - Else, match on kernel, grubdisk and module.  Note that, if root_opt is
+ *   non-zero, the absence of root line is considered a match.
  */
 static entry_t *
-find_boot_entry(menu_t *mp, char *title, char *root, char *module,
-    int root_opt, int *entry_num)
+find_boot_entry(menu_t *mp, char *title, char *kernel, char *root,
+    char *module, int root_opt, int *entry_num)
 {
 	int i;
 	line_t *lp;
@@ -3237,7 +3260,9 @@
 		}
 
 		lp = lp->next;	/* advance to root line */
-		if (lp == NULL || strcmp(lp->cmd, menu_cmds[ROOT_CMD]) == 0) {
+		if (lp == NULL) {
+			continue;
+		} else if (strcmp(lp->cmd, menu_cmds[ROOT_CMD]) == 0) {
 			/* root command found, match grub disk */
 			if (strcmp(lp->arg, root) != 0) {
 				continue;
@@ -3254,28 +3279,35 @@
 			continue;
 		}
 
+		if (kernel &&
+		    (!check_cmd(lp->cmd, KERNEL_CMD, lp->arg, kernel))) {
+			continue;
+		}
+
 		/*
-		 * Check for matching module entry (failsafe or normal).  We
-		 * use a strncmp to match "module" or "module$", since we
-		 * don't know which one it should be.  If it fails to match,
-		 * we go around the loop again.
+		 * Check for matching module entry (failsafe or normal).
+		 * If it fails to match, we go around the loop again.
+		 * For xpv entries, there are two module lines, so we
+		 * do the check twice.
 		 */
 		lp = lp->next;	/* advance to module line */
-		if ((strncmp(lp->cmd, menu_cmds[MODULE_CMD],
-		    strlen(menu_cmds[MODULE_CMD])) != 0) ||
-		    (strcmp(lp->arg, module) != 0)) {
-			continue;
+		if (check_cmd(lp->cmd, MODULE_CMD, lp->arg, module) ||
+		    (((lp = lp->next) != NULL) &&
+		    check_cmd(lp->cmd, MODULE_CMD, lp->arg, module))) {
+			/* match found */
+			break;
 		}
-		break;	/* match found */
-	}
-
-	*entry_num = i;
+	}
+
+	if (entry_num && ent) {
+		*entry_num = i;
+	}
 	return (ent);
 }
 
 static int
 update_boot_entry(menu_t *mp, char *title, char *root, char *kernel,
-    char *module, int root_opt)
+    char *mod_kernel, char *module, int root_opt)
 {
 	int i, change_kernel = 0;
 	entry_t *ent;
@@ -3283,21 +3315,21 @@
 	char linebuf[BAM_MAXLINE];
 
 	/* note: don't match on title, it's updated on upgrade */
-	ent = find_boot_entry(mp, NULL, root, module, root_opt, &i);
+	ent = find_boot_entry(mp, NULL, kernel, root, module, root_opt, &i);
 	if ((ent == NULL) && (bam_direct == BAM_DIRECT_DBOOT)) {
 		/*
 		 * We may be upgrading a kernel from multiboot to
 		 * directboot.  Look for a multiboot entry.
 		 */
-		ent = find_boot_entry(mp, NULL, root, MULTI_BOOT_ARCHIVE,
-		    root_opt, &i);
+		ent = find_boot_entry(mp, NULL, "multiboot", root,
+		    MULTI_BOOT_ARCHIVE, root_opt, NULL);
 		if (ent != NULL) {
 			change_kernel = 1;
 		}
 	}
 	if (ent == NULL)
 		return (add_boot_entry(mp, title, root_opt ? NULL : root,
-		    kernel, module));
+		    kernel, mod_kernel, module));
 
 	/* replace title of exiting entry and delete root line */
 	lp = ent->start;
@@ -3383,15 +3415,22 @@
 	/* add the entry for normal Solaris */
 	if (bam_direct == BAM_DIRECT_DBOOT) {
 		entry = update_boot_entry(mp, title, grubdisk,
-		    DIRECT_BOOT_KERNEL, DIRECT_BOOT_ARCHIVE,
+		    DIRECT_BOOT_KERNEL, NULL, DIRECT_BOOT_ARCHIVE,
 		    osroot == menu_root);
+		if ((entry != BAM_ERROR) && (bam_is_hv == BAM_HV_PRESENT)) {
+			(void) update_boot_entry(mp, NEW_HV_ENTRY, grubdisk,
+			    XEN_MENU, KERNEL_MODULE_LINE, DIRECT_BOOT_ARCHIVE,
+			    osroot == menu_root);
+		}
 	} else {
-		entry = update_boot_entry(mp, title, grubdisk,
-		    MULTI_BOOT, MULTI_BOOT_ARCHIVE,
-		    osroot == menu_root);
-	}
-
-	/* add the entry for failsafe archive */
+		entry = update_boot_entry(mp, title, grubdisk, MULTI_BOOT,
+		    NULL, MULTI_BOOT_ARCHIVE, osroot == menu_root);
+	}
+
+	/*
+	 * Add the entry for failsafe archive.  On a bfu'd system, the
+	 * failsafe may be different than the installed kernel.
+	 */
 	(void) snprintf(failsafe, sizeof (failsafe), "%s%s", osroot, MINIROOT);
 	if (stat(failsafe, &sbuf) == 0) {
 
@@ -3409,9 +3448,8 @@
 		}
 		if (failsafe_kernel != NULL) {
 			(void) update_boot_entry(mp, FAILSAFE_TITLE, grubdisk,
-			    failsafe_kernel, MINIROOT, osroot == menu_root);
-		} else {
-			bam_error(NO_FAILSAFE_KERNEL);
+			    failsafe_kernel, NULL, MINIROOT,
+			    osroot == menu_root);
 		}
 	}
 	free(grubdisk);
@@ -3535,7 +3573,7 @@
 	/* If no option, delete exiting reboot menu entry */
 	if (opt == NULL) {
 		entry_t *ent = find_boot_entry(mp, REBOOT_TITLE, NULL, NULL,
-		    0, &entry);
+		    NULL, 0, &entry);
 		if (ent == NULL)	/* not found is ok */
 			return (BAM_SUCCESS);
 		(void) do_delete(mp, entry);
@@ -3665,12 +3703,12 @@
 			}
 		}
 		entry = add_boot_entry(mp, REBOOT_TITLE, grubdisk, kernbuf,
-		    NULL);
+		    NULL, NULL);
 	} else {
 		(void) snprintf(kernbuf, sizeof (kernbuf), "%s %s",
 		    MULTI_BOOT, opt);
 		entry = add_boot_entry(mp, REBOOT_TITLE, grubdisk, kernbuf,
-		    MULTI_BOOT_ARCHIVE);
+		    NULL, MULTI_BOOT_ARCHIVE);
 	}
 	free(grubdisk);
 
@@ -3918,7 +3956,7 @@
 	}
 
 	entryNum = -1;
-	entryp = find_boot_entry(mp, BOOTENV_RC_TITLE, NULL, NULL, 0,
+	entryp = find_boot_entry(mp, BOOTENV_RC_TITLE, NULL, NULL, NULL, 0,
 	    &entryNum);
 
 	if (entryp != NULL) {
@@ -4076,7 +4114,7 @@
 		}
 		if (optnum == KERNEL_CMD) {
 			entryNum = add_boot_entry(mp, BOOTENV_RC_TITLE,
-			    grubdisk, new_path, NULL);
+			    grubdisk, new_path, NULL, NULL);
 		} else {
 			new_str_len = strlen(DIRECT_BOOT_KERNEL) +
 			    strlen(path) + 8;
@@ -4085,7 +4123,7 @@
 			(void) snprintf(new_arg, new_str_len, "%s %s",
 			    DIRECT_BOOT_KERNEL, path);
 			entryNum = add_boot_entry(mp, BOOTENV_RC_TITLE,
-			    grubdisk, new_arg, DIRECT_BOOT_ARCHIVE);
+			    grubdisk, new_arg, NULL, DIRECT_BOOT_ARCHIVE);
 		}
 		save_default_entry(mp, BAM_OLD_RC_DEF);
 		(void) set_global(mp, menu_cmds[DEFAULT_CMD], entryNum);

--- a/usr/src/cmd/boot/bootadm/bootadm.h	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/boot/bootadm/bootadm.h	Tue Sep 18 15:46:43 2007 -0700
@@ -78,6 +78,7 @@
 #define	BAM_ENTRY_MINIROOT	0x10	/* entry uses the failsafe miniroot */
 #define	BAM_ENTRY_DBOOT		0x20	/* Is a dboot entry */
 #define	BAM_ENTRY_32BIT		0x40	/* Is a 32-bit entry */
+#define	BAM_ENTRY_HV		0x80	/* Is a hypervisor entry */
 
 typedef struct {
 	line_t	*start;
@@ -98,6 +99,9 @@
 /*
  * Menu related
  * menu_cmd_t and menu_cmds must be kept in sync
+ *
+ * The *_DOLLAR_CMD values must be 1 greater than the
+ * respective [KERNEL|MODULE]_CMD values.
  */
 typedef enum {
 	DEFAULT_CMD = 0,
@@ -105,9 +109,9 @@
 	TITLE_CMD,
 	ROOT_CMD,
 	KERNEL_CMD,
-	KERNEL_DOLLAR_CMD,
+	KERNEL_DOLLAR_CMD,	/* Must be KERNEL_CMD + 1 */
 	MODULE_CMD,
-	MODULE_DOLLAR_CMD,
+	MODULE_DOLLAR_CMD,	/* Must be MODULE_CMD + 1 */
 	SEP_CMD,
 	COMMENT_CMD,
 	CHAINLOADER_CMD,
@@ -123,9 +127,17 @@
 	BAM_DIRECT_DBOOT
 } direct_or_multi_t;
 
+/* Is there a hypervisor present? */
+typedef enum {
+	BAM_HV_UNKNOWN,
+	BAM_HV_NO,
+	BAM_HV_PRESENT
+} hv_t;
+
 extern int bam_verbose;
 extern int bam_force;
 extern direct_or_multi_t bam_direct;
+extern hv_t bam_is_hv;
 
 extern error_t upgrade_menu(menu_t *, char *, char *);
 extern void *s_calloc(size_t, size_t);
@@ -137,6 +149,7 @@
 extern char *get_special(char *);
 extern char *os_to_grubdisk(char *, int);
 extern void update_line(line_t *);
+extern int add_boot_entry(menu_t *, char *, char *, char *, char *, char *);
 
 #define	BAM_MAXLINE	8192
 
@@ -157,6 +170,9 @@
 /* Title used for failsafe entries */
 #define	FAILSAFE_TITLE	"Solaris failsafe"
 
+/* Title used for hv entries */
+#define	NEW_HV_ENTRY	"Solaris xVM"
+
 /* multiboot */
 #define	MULTI_BOOT	"/platform/i86pc/multiboot"
 #define	MULTI_BOOT_FAILSAFE	"/boot/multiboot"
@@ -177,6 +193,13 @@
 #define	MULTI_BOOT_ARCHIVE	DIRECT_BOOT_ARCHIVE_32
 #define	MINIROOT	"/boot/x86.miniroot-safe"
 
+/* Hypervisors */
+#define	XEN_32			"/boot/xen.gz"
+#define	XEN_64			"/boot/amd64/xen.gz"
+#define	XEN_MENU		"/boot/$ISADIR/xen.gz"
+#define	HYPERVISOR_KERNEL	"/platform/i86xpv/kernel/$ISADIR/unix"
+#define	KERNEL_MODULE_LINE	HYPERVISOR_KERNEL " " HYPERVISOR_KERNEL
+
 #ifdef __cplusplus
 }
 #endif

--- a/usr/src/cmd/boot/bootadm/bootadm_upgrade.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/boot/bootadm/bootadm_upgrade.c	Tue Sep 18 15:46:43 2007 -0700
@@ -44,6 +44,7 @@
 #include "bootadm.h"
 
 direct_or_multi_t bam_direct = BAM_DIRECT_NOT_SET;
+hv_t bam_is_hv = BAM_HV_UNKNOWN;
 
 error_t
 dboot_or_multiboot(const char *root)
@@ -53,6 +54,7 @@
 	uchar_t *ident;
 	int fd, m;
 	multiboot_header_t *mbh;
+	struct stat sb;
 
 	(void) snprintf(fname, PATH_MAX, "%s/%s", root,
 	    "platform/i86pc/kernel/unix");
@@ -99,6 +101,16 @@
 	}
 	(void) munmap(image, 8192);
 	(void) close(fd);
+
+	if (bam_direct == BAM_DIRECT_DBOOT) {
+		(void) snprintf(fname, PATH_MAX, "%s/%s", root, XEN_32);
+		if (stat(fname, &sb) == 0) {
+			bam_is_hv = BAM_HV_PRESENT;
+		} else {
+			bam_is_hv = BAM_HV_NO;
+		}
+	}
+
 	return (BAM_SUCCESS);
 }
 
@@ -458,12 +470,14 @@
 {
 	entry_t	*cur_entry;
 	line_t	*cur_line;
-	int	i, skipit = 0, num_entries = 0;
+	int	i, skipit, num_entries, found_hv;
 	int	*hand_entries = NULL;
 	boolean_t found_kernel = B_FALSE;
 	error_t	rv;
 	char	*rootdev, *grubdisk = NULL;
 
+	skipit = num_entries = found_hv = 0;
+
 	rootdev = get_special(root);
 	if (rootdev) {
 		grubdisk = os_to_grubdisk(rootdev, strlen(root) == 1);
@@ -495,6 +509,11 @@
 			continue;
 		}
 
+		if (cur_entry->flags & BAM_ENTRY_HV) {
+			found_hv = 1;
+			continue;
+		}
+
 		/*
 		 * We make two loops through the lines.  First, we check if
 		 * there is a root entry, and if so, whether we should be
@@ -555,6 +574,15 @@
 	}
 
 	/*
+	 * If we're upgrading to a virtualized kernel and there are no
+	 * hv entries in menu.lst, we need to add one.
+	 */
+	if ((bam_is_hv == BAM_HV_PRESENT) && (found_hv == 0)) {
+		(void) add_boot_entry(mp, NEW_HV_ENTRY, grubdisk,
+		    XEN_MENU, KERNEL_MODULE_LINE, DIRECT_BOOT_ARCHIVE);
+	}
+
+	/*
 	 * We only want to output one error, to avoid confusing a user.  We
 	 * rank "No kernels changed" as a higher priority than "will not
 	 * update hand-added entries", since the former implies the latter.

--- a/usr/src/cmd/boot/bootadm/filelist.ramdisk	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/boot/bootadm/filelist.ramdisk	Tue Sep 18 15:46:43 2007 -0700
@@ -15,6 +15,7 @@
 kernel
 platform/i86pc/biosint
 platform/i86pc/kernel
+platform/i86xpv/kernel
 platform/i86pc/ucode/GenuineIntel
 platform/i86pc/ucode/AuthenticAMD
 boot/solaris/bootenv.rc

--- a/usr/src/cmd/boot/bootadm/message.h	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/boot/bootadm/message.h	Tue Sep 18 15:46:43 2007 -0700
@@ -368,10 +368,6 @@
 gettext("bootadm -m upgrade run, but the failsafe archives have not been\n\
 updated.  Not updating line %d\n")
 
-#define	NO_FAILSAFE_KERNEL	\
-gettext("Could not find failsafe kernel -- no failsafe entry will be\n\
-installed in /boot/grub/menu.lst\n")
-
 #ifdef	__cplusplus
 }
 #endif

--- a/usr/src/cmd/boot/scripts/root_archive.ksh	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/boot/scripts/root_archive.ksh	Tue Sep 18 15:46:43 2007 -0700
@@ -413,7 +413,11 @@
 	RELEASE=`basename "$RELEASE"`
 
 	mkdir -p "$MEDIA/$RELEASE/Tools/Boot"
+	mkdir -p "$MEDIA/boot/amd64"
 	mkdir -p "$MEDIA/boot/platform/i86pc/kernel"
+	mkdir -p "$MEDIA/boot/platform/i86pc/kernel/amd64"
+	mkdir -p "$MEDIA/boot/platform/i86xpv/kernel"
+	mkdir -p "$MEDIA/boot/platform/i86xpv/kernel/amd64"
 
 	# archive package databases to conserve memory
 	#
@@ -427,12 +431,6 @@
 	rm -rf "$MINIROOT/tmp/root/var/sadm/install"
 	rm -rf "$MINIROOT/tmp/root/var/sadm/pkg"
 
-	# clear out 64 bit support to conserve memory
-	#
-	if [ "$STRIP_AMD64" != false ] ; then
-		find "$MINIROOT" -name amd64 -type directory | xargs rm -rf
-	fi
-
 	archive_X "$MEDIA" "$MINIROOT"
 
 	# Take out the gnome and java parts of the installer from
@@ -447,6 +445,12 @@
 	cp "$MINIROOT/platform/i86pc/multiboot" "$MEDIA/boot"
 	cp "$MINIROOT/platform/i86pc/kernel/unix" \
 	    "$MEDIA/boot/platform/i86pc/kernel/unix"
+	cp "$MINIROOT/platform/i86pc/kernel/amd64/unix" \
+	    "$MEDIA/boot/platform/i86pc/kernel/amd64/unix"
+	cp "$MINIROOT/platform/i86xpv/kernel/unix" \
+	    "$MEDIA/boot/platform/i86xpv/kernel/unix"
+	cp "$MINIROOT/platform/i86xpv/kernel/amd64/unix" \
+	    "$MEDIA/boot/platform/i86xpv/kernel/amd64/unix"
 
 	# copy the install menu to menu.lst so we have a menu
 	# on the install media
@@ -459,6 +463,10 @@
 	(
 		cd "$MEDIA/$RELEASE/Tools/Boot"
 		ln -sf ../../../boot/x86.miniroot
+		ln -sf ../../../boot/platform/i86pc/kernel/unix
+		ln -sf ../../../boot/platform/i86pc/kernel/amd64/unix
+		ln -sf ../../../boot/platform/i86xpv/kernel/unix
+		ln -sf ../../../boot/platform/i86xpv/kernel/amd64/unix
 		ln -sf ../../../boot/multiboot
 		ln -sf ../../../boot/grub/pxegrub
 	)
@@ -669,13 +677,28 @@
 case $1 in
 	packmedia)
 		MEDIA="$MR"
-		MR="$MR/boot/x86.miniroot"
+		MR="$MEDIA/boot/x86.miniroot"
 
 		if [ -d "$UNPACKED_ROOT/kernel/drv/sparcv9" ] ; then
 			archive_X "$MEDIA" "$UNPACKED_ROOT"
 		else
 			packmedia "$MEDIA" "$UNPACKED_ROOT"
+			
+			# create the 64-bit miniroot
+			# if the -6 option was passed, don't strip
+			# the 64-bit modules from the 32-bit miniroot
+			MR="$MEDIA/boot/amd64/x86.miniroot"
 			pack
+
+			if [ "$STRIP_AMD64" = false ] ; then
+				ln $MR $MEDIA/boot/x86.miniroot
+			else
+				# create the 32-bit miniroot
+				MR="$MEDIA/boot/x86.miniroot"
+				find "$UNPACKED_ROOT" -name amd64 \
+				    -type directory | xargs rm -rf
+				pack
+			fi
 		fi ;;
 	unpackmedia)
 		MEDIA="$MR"

--- a/usr/src/cmd/cmd-inet/sbin/netstrategy/Makefile	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/cmd-inet/sbin/netstrategy/Makefile	Tue Sep 18 15:46:43 2007 -0700
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,7 +30,7 @@
 
 include ../../../Makefile.cmd
 
-LDLIBS	+= -lsocket
+LDLIBS	+= -lsocket -ldevinfo
 
 .KEEP_STATE:
 

--- a/usr/src/cmd/cmd-inet/sbin/netstrategy/netstrategy.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/cmd-inet/sbin/netstrategy/netstrategy.c	Tue Sep 18 15:46:43 2007 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -39,7 +38,8 @@
  *    where:
  *	<root fs type>		-	"nfs" or "ufs"
  *	<interface name>	-	"hme0" or "none"
- *	<net config strategy>	-	"dhcp", "rarp", or "none"
+ *	<net config strategy>	-	"dhcp", "rarp", "bootprops"
+ *					or "none"
  *
  *    Eg:
  *	# /sbin/netstrategy
@@ -50,11 +50,16 @@
  *    <interface name> is the 16 char name of the root interface, and is only
  *	set if rarp/dhcp was used to configure the interface.
  *
- *    <net config strategy> can be either "rarp", "dhcp", or "none" depending
- *	on which strategy was used to configure the interface. Is "none" if
- *	no interface was configured using a net-based strategy.
+ *    <net config strategy> can be either "rarp", "dhcp", "bootprops", or
+ *	"none" depending on which strategy was used to configure the
+ *	interface. Is "none" if no interface was configured using a
+ *	net-based strategy.
  *
  * CAVEATS: what about autoclient systems? XXX
+ *
+ * The logic here must match that in usr/src/uts/common/fs/nfs/nfs_dlinet.c,
+ * in particular that code (which implements diskless boot) imposes an
+ * ordering on possible ways of configuring network interfaces.
  */
 
 #include <stdio.h>
@@ -69,25 +74,203 @@
 #include <sys/sockio.h>
 #include <net/if.h>
 #include <sys/statvfs.h>
+#include <libdevinfo.h>
+
+static char *program;
+
+static char *
+get_root_fstype()
+{
+	static struct statvfs vfs;
+
+	/* root location */
+	if (statvfs("/", &vfs) < 0) {
+		return ("none");
+	} else {
+		if (strncmp(vfs.f_basetype, "nfs", sizeof ("nfs") - 1) == 0)
+			vfs.f_basetype[sizeof ("nfs") - 1] = '\0';
+		return (vfs.f_basetype);
+	}
+}
+
+/*
+ * The following boot properties can be used to configure a network
+ * interface in the case of a diskless boot.
+ *	host-ip, subnet-mask, server-path, server-name, server-ip.
+ *
+ * XXX non-diskless case requires "network-interface"?
+ */
+static boolean_t
+boot_properties_present()
+{
+	/* XXX should use sys/bootprops.h, but it's not delivered */
+	const char *required_properties[] = {
+		"host-ip",
+		"subnet-mask",
+		"server-path",
+		"server-name",
+		"server-ip",
+		NULL,
+	};
+	const char **prop = required_properties;
+	char *prop_value;
+	di_node_t dn;
+
+	if ((dn = di_init("/", DINFOPROP)) == DI_NODE_NIL) {
+		(void) fprintf(stderr, "%s: di_init: %s\n", program,
+		    strerror(errno));
+		di_fini(dn);
+		return (B_FALSE);
+	}
+
+	while (*prop != NULL) {
+		if (di_prop_lookup_strings(DDI_DEV_T_ANY,
+		    dn, *prop, &prop_value) != 1) {
+			di_fini(dn);
+			return (B_FALSE);
+		}
+		prop++;
+	}
+	di_fini(dn);
+
+	return (B_TRUE);
+}
+
+static char *
+get_first_interface()
+{
+	int fd;
+	struct lifnum ifnum;
+	struct lifconf ifconf;
+	struct lifreq *ifr;
+	static char interface[IFNAMSIZ];
+
+	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
+		(void) fprintf(stderr, "%s: socket: %s\n", program,
+		    strerror(errno));
+		return (NULL);
+	}
+
+	ifnum.lifn_family = AF_UNSPEC;
+
+	if (ioctl(fd, SIOCGLIFNUM, &ifnum) < 0) {
+		(void) fprintf(stderr, "%s: SIOCGLIFNUM: %s\n", program,
+		    strerror(errno));
+		(void) close(fd);
+		return (NULL);
+	}
+
+	ifconf.lifc_family = AF_UNSPEC;
+	ifconf.lifc_len = ifnum.lifn_count * sizeof (struct lifreq);
+	ifconf.lifc_buf = alloca(ifconf.lifc_len);
+
+	if (ioctl(fd, SIOCGLIFCONF, &ifconf) < 0) {
+		(void) fprintf(stderr, "%s: SIOCGLIFCONF: %s\n", program,
+		    strerror(errno));
+		(void) close(fd);
+		return (NULL);
+	}
+
+	for (ifr = ifconf.lifc_req; ifr < &ifconf.lifc_req[ifconf.lifc_len /
+	    sizeof (ifconf.lifc_req[0])]; ifr++) {
+
+		if (strchr(ifr->lifr_name, ':') != NULL)
+			continue;	/* skip logical interfaces */
+
+		if (ioctl(fd, SIOCGLIFFLAGS, ifr) < 0) {
+			(void) fprintf(stderr, "%s: SIOCGIFFLAGS: %s\n",
+			    program, strerror(errno));
+			continue;
+		}
+
+		if (ifr->lifr_flags & (IFF_VIRTUAL|IFF_POINTOPOINT))
+			continue;
+
+		if (ifr->lifr_flags & IFF_UP) {
+			/*
+			 * For the "nfs rarp" and "nfs bootprops"
+			 * cases, we assume that the first non-virtual
+			 * IFF_UP interface is the one used.
+			 *
+			 * Since the order of the interfaces retrieved
+			 * via SIOCGLIFCONF is not deterministic, this
+			 * is largely silliness, but (a) "it's always
+			 * been this way", (b) machines booted this
+			 * way typically only have one interface, and
+			 * (c) no one consumes the interface name in
+			 * the RARP case anyway.
+			 */
+			(void) strncpy(interface, ifr->lifr_name, IFNAMSIZ);
+			(void) close(fd);
+			return (interface);
+		}
+	}
+
+	(void) close(fd);
+
+	return (NULL);
+}
+
+/*
+ * Is DHCP running on the specified interface?
+ */
+static boolean_t
+check_dhcp_running(char *interface)
+{
+	int fd;
+	struct ifreq ifr;
+
+	if (interface == NULL)
+		return (B_FALSE);
+
+	(void) strncpy(ifr.ifr_name, interface, IFNAMSIZ);
+
+	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
+		(void) fprintf(stderr, "%s: socket: %s\n", program,
+		    strerror(errno));
+		return (B_FALSE);
+	}
+
+	if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
+		(void) fprintf(stderr, "%s: SIOCGIFFLAGS: %s\n",
+		    program, strerror(errno));
+		return (B_FALSE);
+	}
+
+	if (ifr.ifr_flags & IFF_DHCPRUNNING)
+		return (B_TRUE);
+
+	return (B_FALSE);
+}
 
 /* ARGSUSED */
 int
 main(int argc, char *argv[])
 {
-	struct statvfs	vfs;
-	char		*root, *interface, *strategy, dummy;
-	long		len;
-	int		fd, nifs, nlifr;
-	struct lifreq	*lifr;
-	struct lifconf	lifc;
+	char *root, *interface, *strategy, dummy;
+	long len;
+
+	root = interface = strategy = NULL;
+	program = argv[0];
+
+	root = get_root_fstype();
 
-	/* root location */
-	if (statvfs("/", &vfs) < 0)
-		root = "none";
-	else {
-		if (strncmp(vfs.f_basetype, "nfs", sizeof ("nfs") - 1) == 0)
-			vfs.f_basetype[sizeof ("nfs") - 1] = '\0';
-		root = vfs.f_basetype;
+	/*
+	 * If diskless, perhaps boot properties were used to configure
+	 * the interface.
+	 */
+	if ((strcmp(root, "nfs") == 0) && boot_properties_present()) {
+		strategy = "bootprops";
+
+		interface = get_first_interface();
+		if (interface == NULL) {
+			(void) fprintf(stderr,
+			    "%s: cannot identify root interface.\n", program);
+			return (2);
+		}
+
+		(void) printf("%s %s %s\n", root, interface, strategy);
+		return (0);
 	}
 
 	/*
@@ -124,79 +307,15 @@
 	 *	   It's too bad there isn't an IFF_RARPRUNNING flag.
 	 */
 
-	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
-		(void) fprintf(stderr, "%s: socket: %s\n", argv[0],
-		    strerror(errno));
-		return (2);
-	}
-
-	if (ioctl(fd, SIOCGIFNUM, &nifs) < 0) {
-		(void) fprintf(stderr, "%s: SIOCGIFNUM: %s\n", argv[0],
-		    strerror(errno));
-		(void) close(fd);
-		return (2);
-	}
-
-	lifc.lifc_len = nifs * sizeof (struct lifreq);
-	lifc.lifc_buf = alloca(lifc.lifc_len);
-	lifc.lifc_flags = 0;
-	lifc.lifc_family = AF_INET;
-
-	if (ioctl(fd, SIOCGLIFCONF, &lifc) < 0) {
-		(void) fprintf(stderr, "%s: SIOCGLIFCONF: %s\n", argv[0],
-		    strerror(errno));
-		(void) close(fd);
-		return (2);
-	}
-
-	strategy = NULL;
-	interface = NULL;
-
-	nlifr = lifc.lifc_len / sizeof (struct lifreq);
-	for (lifr = lifc.lifc_req; nlifr > 0; lifr++, nlifr--) {
-
-		if (strchr(lifr->lifr_name, ':') != NULL)
-			continue;	/* skip logical interfaces */
+	interface = get_first_interface();
 
-		if (ioctl(fd, SIOCGLIFFLAGS, lifr) < 0) {
-			(void) fprintf(stderr, "%s: SIOCGLIFFLAGS: %s\n",
-			    argv[0], strerror(errno));
-			continue;
-		}
-
-		if (lifr->lifr_flags & (IFF_VIRTUAL|IFF_POINTOPOINT))
-			continue;
-
-		if (lifr->lifr_flags & IFF_UP) {
-			/*
-			 * For the "nfs rarp" case, we assume that the first
-			 * IFF_UP interface is the one using RARP, so stash
-			 * away the first interface in case we need it.
-			 *
-			 * Since the order of the interfaces retrieved via
-			 * SIOCGLIFCONF is not deterministic, this is largely
-			 * silliness, but (a) "it's always been this way", (b)
-			 * machines booted via diskless RARP typically only
-			 * have one interface, and (c) no one consumes the
-			 * interface name in the RARP case anyway.
-			 */
-			if (interface == NULL)
-				interface = lifr->lifr_name;
-
-			if (lifr->lifr_flags & IFF_DHCPRUNNING) {
-				interface = lifr->lifr_name;
-				strategy = "dhcp";
-				break;
-			}
-		}
-	}
-
-	(void) close(fd);
+	if (check_dhcp_running(interface))
+		strategy = "dhcp";
 
 	if (strcmp(root, "nfs") == 0 || strcmp(root, "cachefs") == 0) {
 		if (interface == NULL) {
 			(void) fprintf(stderr,
-			    "%s: cannot identify root interface.\n", argv[0]);
+			    "%s: cannot identify root interface.\n", program);
 			return (2);
 		}
 		if (strategy == NULL)

--- a/usr/src/cmd/devfsadm/Makefile.com	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/devfsadm/Makefile.com	Tue Sep 18 15:46:43 2007 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -66,7 +66,7 @@
 	$(COMMON)/md_link.c	\
 	$(COMMON)/dtrace_link.c	\
 	$(COMMON)/zfs_link.c	\
-	$(LINK_SRCS_($MACH))
+	$(LINK_SRCS_$(MACH))
 
 LINT_MODULES = $(LINK_SRCS:.c=.ln)
 
@@ -87,7 +87,7 @@
 	md_link.o		\
 	dtrace_link.o		\
 	zfs_link.o		\
-	$(LINK_OBJS_($MACH))
+	$(LINK_OBJS_$(MACH))
 
 LINK_MODS =			\
 	SUNW_disk_link.so	\

--- a/usr/src/cmd/devfsadm/i386/Makefile	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/devfsadm/i386/Makefile	Tue Sep 18 15:46:43 2007 -0700
@@ -19,17 +19,36 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 
-LINK_SRCS_i386 = misc_link_i386.c lx_link_i386.c
-LINK_OBJS_i386 = misc_link_i386.o lx_link_i386.o
-LINK_MODS_i386 = SUNW_misc_link_i386.so SUNW_lx_link_i386.so
+MISC_LINK_ISA	= misc_link_i386
+LX_LINK_ISA	= lx_link_i386
+XEN_LINK	= xen_link
+
+LINK_SRCS_i386 = 			\
+	$(MISC_LINK_ISA).c		\
+	$(LX_LINK_ISA).c		\
+	$(XEN_LINK).c
+
+LINK_OBJS_i386 =			\
+	$(MISC_LINK_ISA).o		\
+	$(LX_LINK_ISA).o		\
+	$(XEN_LINK).o
+
+LINK_MODS_i386 =			\
+	SUNW_$(MISC_LINK_ISA).so	\
+	SUNW_$(LX_LINK_ISA).so		\
+	SUNW_$(XEN_LINK).so
 
 include ../Makefile.com
 
-lx_link_i386.o := CPPFLAGS += -I$(UTSBASE)/common/brand/lx
+$(LX_LINK_ISA).o $(LX_LINK_ISA).ln $(LX_LINK_ISA).po \
+	:= CPPFLAGS += -I$(UTSBASE)/common/brand/lx
+
+$(XEN_LINK).o $(XEN_LINK).ln $(XEN_LINK).po \
+	:= CPPFLAGS += -I$(UTSBASE)/i86xpv
 
 install: all

--- a/usr/src/cmd/devfsadm/i386/misc_link_i386.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/devfsadm/i386/misc_link_i386.c	Tue Sep 18 15:46:43 2007 -0700
@@ -585,8 +585,6 @@
 static int
 ucode(di_minor_t minor, di_node_t node)
 {
-	char *mn;
-
 	(void) devfsadm_mklink("ucode", node, minor, 0);
 	return (DEVFSADM_CONTINUE);
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/devfsadm/i386/xen_link.c	Tue Sep 18 15:46:43 2007 -0700
@@ -0,0 +1,95 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <regex.h>
+#include <devfsadm.h>
+#include <stdio.h>
+#include <strings.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <sys/privcmd_impl.h>
+#include <sys/domcaps_impl.h>
+#include <sys/balloon.h>
+
+/*
+ * Handle miscellaneous children of xendev
+ */
+static int devxen(di_minor_t, di_node_t);
+
+static devfsadm_create_t xen_cbt[] = {
+	{ "xendev", DDI_PSEUDO, "xenbus",
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, devxen,
+	},
+	{ "xendev", DDI_PSEUDO, PRIVCMD_DRIVER_NAME,
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, devxen,
+	},
+	{ "xendev", DDI_PSEUDO, "evtchn",
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, devxen,
+	},
+	{ "xendev", DDI_PSEUDO, DOMCAPS_DRIVER_NAME,
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, devxen,
+	},
+	{ "xendev", DDI_PSEUDO, BALLOON_DRIVER_NAME,
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, devxen,
+	},
+};
+
+DEVFSADM_CREATE_INIT_V0(xen_cbt);
+
+static devfsadm_remove_t xen_remove_cbt[] = {
+	{ "xendev", "^" "xen/xenbus" "$", RM_ALWAYS | RM_PRE | RM_HOT,
+	    ILEVEL_0, devfsadm_rm_all
+	},
+	{ "xendev", "^" PRIVCMD_PATHNAME "$", RM_ALWAYS | RM_PRE | RM_HOT,
+	    ILEVEL_0, devfsadm_rm_all
+	},
+	{ "xendev", "^" "xen/evtchn" "$", RM_ALWAYS | RM_PRE | RM_HOT,
+	    ILEVEL_0, devfsadm_rm_all
+	},
+	{ "xendev", "^" DOMCAPS_PATHNAME "$", RM_ALWAYS | RM_PRE | RM_HOT,
+	    ILEVEL_0, devfsadm_rm_all
+	},
+	{ "xendev", "^" BALLOON_PATHNAME "$", RM_ALWAYS | RM_PRE | RM_HOT,
+	    ILEVEL_0, devfsadm_rm_all
+	},
+};
+
+DEVFSADM_REMOVE_INIT_V0(xen_remove_cbt);
+
+/*
+ * /dev/xen/<foo>	->	/devices/xendev/<whatever>:<foo>
+ */
+static int
+devxen(di_minor_t minor, di_node_t node)
+{
+	char buf[256];
+
+	(void) snprintf(buf, sizeof (buf), "xen/%s", di_minor_name(minor));
+	(void) devfsadm_mklink(buf, node, minor, 0);
+
+	return (DEVFSADM_CONTINUE);
+}

--- a/usr/src/cmd/devfsadm/misc_link.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/devfsadm/misc_link.c	Tue Sep 18 15:46:43 2007 -0700
@@ -199,7 +199,7 @@
 		ZCONS_SLAVE_NAME ")$",
 	    RM_PRE | RM_HOT | RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 	},
-	{ "pseudo", "^cpu/self/cpuid$", RM_ALWAYS | RM_PRE | RM_HOT,
+	{ "pseudo", "^" CPUID_SELF_NAME "$", RM_ALWAYS | RM_PRE | RM_HOT,
 	    ILEVEL_0, devfsadm_rm_all
 	},
 	{ "enclosure", "^es/ses[0-9]+$", RM_POST,

--- a/usr/src/cmd/devfsadm/sparc/Makefile	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/devfsadm/sparc/Makefile	Tue Sep 18 15:46:43 2007 -0700
@@ -19,14 +19,21 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 
-LINK_SRCS_sparc = misc_link_sparc.c
-LINK_OBJS_sparc = misc_link_sparc.o
-LINK_MODS_sparc = SUNW_misc_link_sparc.so
+MISC_LINK_ISA	= misc_link_sparc
+
+LINK_SRCS_sparc =		\
+	$(MISC_LINK_ISA).c
+
+LINK_OBJS_sparc =		\
+	$(MISC_LINK_ISA).o
+
+LINK_MODS_sparc =		\
+	SUNW_$(MISC_LINK_ISA).so
 
 include ../Makefile.com
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/devprop/Makefile	Tue Sep 18 15:46:43 2007 -0700
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+PROG		= devprop
+ROOTFS_PROG	= $(PROG)
+
+include		../Makefile.cmd
+
+LDLIBS		+= -ldevinfo
+
+.KEEP_STATE:
+
+all:		$(ROOTFS_PROG)
+
+install:	all $(ROOTSBINPROG)
+
+clean:
+
+lint:		lint_PROG
+
+include		../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/devprop/devprop.c	Tue Sep 18 15:46:43 2007 -0700
@@ -0,0 +1,158 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <strings.h>
+#include <libdevinfo.h>
+
+static void
+usage(void)
+{
+	(void) fprintf(stderr,
+	    "Usage: devprop [-n device-path] "
+	    "[-vq] [-{b|i|l|s}] [property [...]]\n");
+}
+
+int
+main(int argc, char *argv[])
+{
+	int c;
+	boolean_t verbose = B_FALSE, quote = B_FALSE,
+	    error = B_FALSE;
+	int type = DI_PROP_TYPE_UNKNOWN;
+	char *path = "/";
+	di_node_t dn;
+	uchar_t *val_b;
+	int *val_i;
+	int64_t *val_l;
+	char *val_s;
+	int n;
+
+	extern char *optarg;
+	extern int optind;
+
+#define	BOOL(ch, var)				\
+case ch:					\
+	var = B_TRUE;				\
+	break
+
+#define	PER_OPT(ch, typ)			\
+case ch:					\
+	if (type != DI_PROP_TYPE_UNKNOWN) {	\
+		usage();			\
+		return (1);			\
+	}					\
+	type = (typ);				\
+	break
+
+	while ((c = getopt(argc, argv, ":n:vqbils")) != -1) {
+		switch (c) {
+		case 'n':
+			path = optarg;
+			break;
+		case ':':
+			usage();
+			return (1);
+
+		BOOL('v', verbose);
+		BOOL('q', quote);
+		BOOL('?', error);
+
+		PER_OPT('b', DI_PROP_TYPE_BYTE);
+		PER_OPT('i', DI_PROP_TYPE_INT);
+		PER_OPT('l', DI_PROP_TYPE_INT64);
+		PER_OPT('s', DI_PROP_TYPE_STRING);
+		}
+	}
+
+#undef	BOOL
+#undef	PER_OPT
+
+	if (error) {
+		usage();
+		return (1);
+	}
+
+	/* default to strings */
+	if (type == DI_PROP_TYPE_UNKNOWN)
+		type = DI_PROP_TYPE_STRING;
+
+	/*
+	 * It's convenient to use the filesystem as a source of device
+	 * node paths.  In that case, the path will be prefixed with
+	 * "/devices", which we strip off here as di_init() expects
+	 * just the path to the node.
+	 */
+	if (strncmp("/devices/", path, strlen("/devices/")) == 0)
+		path += strlen("/devices");
+
+	if ((dn = di_init(path, DINFOPROP)) == DI_NODE_NIL) {
+		perror("di_init");
+		return (1);
+	}
+
+	/* Careful with that axe, Eugene... */
+#define	PER_TYPE(typ, func, val, incr, form, pv, sep)	\
+case (typ):						\
+	n = func(DDI_DEV_T_ANY,				\
+	    dn, argv[optind], &(val));			\
+	while (n > 0) {					\
+		(void) printf((form), pv);		\
+		incr;					\
+		n--;					\
+		if (n > 0)				\
+			(void) printf(sep);		\
+	}						\
+	(void) printf("\n");				\
+	break
+
+	while (optind < argc) {
+		if (verbose)
+			(void) printf("%s=", argv[optind]);
+
+		switch (type) {
+		PER_TYPE(DI_PROP_TYPE_BYTE, di_prop_lookup_bytes,
+		    val_b, val_b++, "%2.2x", *val_b, ".");
+		PER_TYPE(DI_PROP_TYPE_INT, di_prop_lookup_ints,
+		    val_i, val_i++, "%8.8x", *val_i, ".");
+		PER_TYPE(DI_PROP_TYPE_INT64, di_prop_lookup_int64,
+		    val_l, val_l++, "%16.16llx", *val_l, ".");
+		PER_TYPE(DI_PROP_TYPE_STRING, di_prop_lookup_strings,
+		    val_s, val_s += strlen(val_s) + 1,
+		    (quote ? "\"%s\"" : "%s"), val_s, " + ");
+		}
+
+		optind++;
+	}
+
+#undef	PER_TYPE
+
+	di_fini(dn);
+
+	return (0);
+}

--- a/usr/src/cmd/fm/modules/common/cpumem-retire/cma_main.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/fm/modules/common/cpumem-retire/cma_main.c	Tue Sep 18 15:46:43 2007 -0700
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,6 +33,8 @@
 #include <time.h>
 #include <fm/fmd_api.h>
 #include <sys/fm/protocol.h>
+#include <sys/systeminfo.h>
+#include <sys/utsname.h>
 
 cma_t cma;
 
@@ -255,6 +257,16 @@
 _fmd_init(fmd_hdl_t *hdl)
 {
 	hrtime_t nsec;
+	char buf[SYS_NMLN];
+	int ret;
+
+	/*
+	 * Abort the cpumem-retire module if Solaris is running under the Xen
+	 * hypervisor.
+	 */
+	ret = sysinfo(SI_PLATFORM, buf, sizeof (buf));
+	if (ret == -1 || (strncmp(buf, "i86xpv", sizeof (buf)) == 0))
+		return;
 
 	if (fmd_hdl_register(hdl, FMD_API_VERSION, &fmd_info) != 0)
 		return; /* invalid data in configuration file */

--- a/usr/src/cmd/format/init_ci386.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/format/init_ci386.c	Tue Sep 18 15:46:43 2007 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,9 @@
  *
  * CDDL HEADER END
  */
-
 /*
- * Copyright (c) 1996,2000 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,6 +36,7 @@
 extern	struct ctlr_ops scsiops;
 extern	struct ctlr_ops ataops;
 extern	struct ctlr_ops pcmcia_ataops;
+extern  struct ctlr_ops genericops;
 
 /*
  * This array defines the supported controller types
@@ -59,6 +58,11 @@
 		&pcmcia_ataops,
 		CF_NOFORMAT | CF_NOWLIST },
 
+	{ DKC_VBD,
+		"virtual-dsk",
+		&genericops,
+		CF_NOWLIST },
+
 };
 
 /*

--- a/usr/src/cmd/format/label.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/format/label.c	Tue Sep 18 15:46:43 2007 -0700
@@ -60,7 +60,7 @@
  */
 static int	do_geometry_sanity_check(void);
 static int	vtoc_to_label(struct dk_label *label, struct vtoc *vtoc,
-		struct dk_geom *geom);
+		struct dk_geom *geom, struct dk_cinfo *cinfo);
 extern int	read_vtoc(int, struct vtoc *);
 extern int	write_vtoc(int, struct vtoc *);
 static int	vtoc64_to_label(struct efi_info *, struct dk_gpt *);
@@ -194,13 +194,13 @@
 
 	if (uscsi_read_capacity(cur_file, &capacity)) {
 		err_print("Warning: Unable to get capacity."
-				" Cannot check geometry\n");
+		    " Cannot check geometry\n");
 		return (0);	/* Just ignore this problem */
 	}
 
 	if (capacity.sc_capacity < ncyl * nhead * nsect) {
 		err_print("\nWarning: Current geometry overshoots "
-				"actual geometry of disk\n\n");
+		    "actual geometry of disk\n\n");
 		if (check("Continue labelling disk") != 0)
 			return (-1);
 		return (0);	/* Just ignore this problem */
@@ -220,8 +220,8 @@
 	struct dk_gpt	*efi;
 
 	if (efi_alloc_and_init(fd, EFI_NUMPAR, new_vtoc) != 0) {
-	    err_print("SMI vtoc to EFI failed\n");
-	    return (-1);
+		err_print("SMI vtoc to EFI failed\n");
+		return (-1);
 	}
 	efi = *new_vtoc;
 
@@ -281,17 +281,17 @@
 	 * If EFI label, then write it out to disk
 	 */
 	if (cur_label == L_TYPE_EFI) {
-	    enter_critical();
-	    vtoc64 = cur_parts->etoc;
-	    err_check(vtoc64);
-	    if (efi_write(cur_file, vtoc64) != 0) {
-		err_print("Warning: error writing EFI.\n");
-		error = -1;
-	    }
+		enter_critical();
+		vtoc64 = cur_parts->etoc;
+		err_check(vtoc64);
+		if (efi_write(cur_file, vtoc64) != 0) {
+			err_print("Warning: error writing EFI.\n");
+			error = -1;
+			}
 
-	    cur_disk->disk_flags |= DSK_LABEL;
-	    exit_critical();
-	    return (error);
+		cur_disk->disk_flags |= DSK_LABEL;
+		exit_critical();
+		return (error);
 	}
 
 	/*
@@ -429,21 +429,20 @@
 	for (sec = 1; ((sec < BAD_LISTCNT * 2 + 1) && (sec < nsect));
 	    sec += 2) {
 		if ((*cur_ops->op_rdwr)(DIR_READ, cur_file, (diskaddr_t)
-			((chs2bn(ncyl + acyl - 1, head, sec)) + solaris_offset),
-			1, (caddr_t)&new_label, F_NORMAL, NULL)) {
+		    ((chs2bn(ncyl + acyl - 1, head, sec)) + solaris_offset),
+		    1, (caddr_t)&new_label, F_NORMAL, NULL)) {
 			err_print("Warning: error reading backup label.\n");
 			error = -1;
 		} else {
 			if (bcmp((char *)&label, (char *)&new_label,
-				sizeof (struct dk_label)) == 0) {
+			    sizeof (struct dk_label)) == 0) {
 					nbackups++;
 			}
 		}
 	}
 	if (nbackups != BAD_LISTCNT) {
 		err_print("Warning: %s\n", nbackups == 0 ?
-			"no backup labels" :
-			"some backup labels incorrect");
+		    "no backup labels" : "some backup labels incorrect");
 	}
 	/*
 	 * Mark the current disk as labelled and notify the kernel of what
@@ -466,11 +465,15 @@
 {
 	struct vtoc	vtoc;
 	struct dk_geom	geom;
+	struct dk_cinfo	dkinfo;
 
-	if (read_vtoc(fd, &vtoc) < 0 || ioctl(fd, DKIOCGGEOM, &geom) == -1) {
+	if (read_vtoc(fd, &vtoc) < 0		||
+	    ioctl(fd, DKIOCGGEOM, &geom) == -1	||
+	    ioctl(fd, DKIOCINFO, &dkinfo) == -1) {
 		return (-1);
 	}
-	return (vtoc_to_label(label, &vtoc, &geom));
+
+	return (vtoc_to_label(label, &vtoc, &geom, &dkinfo));
 }
 
 int
@@ -608,7 +611,7 @@
 	/* XXX do a sanity check here for nparts */
 	nparts = vtoc->efi_nparts;
 	lmap = (struct dk_gpt *) calloc(1, (sizeof (struct dk_part) *
-		    nparts) + sizeof (struct dk_gpt));
+	    nparts) + sizeof (struct dk_gpt));
 	if (lmap == NULL) {
 		err_print("vtoc64_to_label: unable to allocate lmap\n");
 		fullabort();
@@ -628,7 +631,7 @@
 	lmap->efi_last_u_lba = vtoc->efi_last_u_lba;
 	lmap->efi_flags = vtoc->efi_flags;
 	(void) memcpy((uchar_t *)&lmap->efi_disk_uguid,
-		(uchar_t *)&vtoc->efi_disk_uguid, sizeof (struct uuid));
+	    (uchar_t *)&vtoc->efi_disk_uguid, sizeof (struct uuid));
 
 	for (i = 0; i < nparts; i++) {
 		lmap->efi_parts[i].p_tag = vtoc->efi_parts[i].p_tag;
@@ -650,7 +653,8 @@
  * Convert vtoc/geom to label.
  */
 static int
-vtoc_to_label(struct dk_label *label, struct vtoc *vtoc, struct dk_geom *geom)
+vtoc_to_label(struct dk_label *label, struct vtoc *vtoc, struct dk_geom *geom,
+    struct dk_cinfo *cinfo)
 {
 #if defined(_SUNOS_VTOC_8)
 	struct dk_map32		*lmap;
@@ -670,7 +674,7 @@
 	 * Sanity-check the vtoc
 	 */
 	if (vtoc->v_sanity != VTOC_SANE || vtoc->v_sectorsz != DEV_BSIZE ||
-			vtoc->v_nparts != V_NUMPAR) {
+	    vtoc->v_nparts != V_NUMPAR) {
 		return (-1);
 	}
 
@@ -678,7 +682,7 @@
 	 * Sanity check of geometry
 	 */
 	if (geom->dkg_ncyl == 0 || geom->dkg_nhead == 0 ||
-			geom->dkg_nsect == 0) {
+	    geom->dkg_nsect == 0) {
 		return (-1);
 	}
 
@@ -718,25 +722,30 @@
 	label->dkl_vtoc.v_version = vtoc->v_version;
 
 	(void) memcpy(label->dkl_vtoc.v_volume, vtoc->v_volume,
-		LEN_DKL_VVOL);
+	    LEN_DKL_VVOL);
 	for (i = 0; i < V_NUMPAR; i++) {
 		label->dkl_vtoc.v_part[i].p_tag = vtoc->v_part[i].p_tag;
 		label->dkl_vtoc.v_part[i].p_flag = vtoc->v_part[i].p_flag;
 	}
 	(void) memcpy((char *)label->dkl_vtoc.v_bootinfo,
-		(char *)vtoc->v_bootinfo, sizeof (vtoc->v_bootinfo));
+	    (char *)vtoc->v_bootinfo, sizeof (vtoc->v_bootinfo));
 	(void) memcpy((char *)label->dkl_vtoc.v_reserved,
-		(char *)vtoc->v_reserved, sizeof (vtoc->v_reserved));
+	    (char *)vtoc->v_reserved, sizeof (vtoc->v_reserved));
 	(void) memcpy((char *)label->dkl_vtoc.v_timestamp,
-		(char *)vtoc->timestamp, sizeof (vtoc->timestamp));
+	    (char *)vtoc->timestamp, sizeof (vtoc->timestamp));
 
 	(void) memcpy(label->dkl_asciilabel, vtoc->v_asciilabel,
-		LEN_DKL_ASCII);
+	    LEN_DKL_ASCII);
 
 	/*
 	 * Note the conversion from starting sector number
 	 * to starting cylinder number.
 	 * Return error if division results in a remainder.
+	 *
+	 * Note: don't check, if probing virtual disk in Xen
+	 * for that virtual disk will use fabricated # of headers
+	 * and sectors per track which may cause the capacity
+	 * not multiple of # of blocks per cylinder
 	 */
 #if defined(_SUNOS_VTOC_8)
 	lmap = label->dkl_map;
@@ -752,9 +761,11 @@
 	nblks = (int)label->dkl_nsect * (int)label->dkl_nhead;
 
 	for (i = 0; i < NDKMAP; i++, lmap++, vpart++) {
-		if ((vpart->p_start % nblks) != 0 ||
-				(vpart->p_size % nblks) != 0) {
-			return (-1);
+		if (cinfo->dki_ctype != DKC_VBD) {
+			if ((vpart->p_start % nblks) != 0 ||
+			    (vpart->p_size % nblks) != 0) {
+				return (-1);
+			}
 		}
 #if defined(_SUNOS_VTOC_8)
 		lmap->dkl_cylno = vpart->p_start / nblks;
@@ -826,16 +837,16 @@
 #endif	/* defined(_SUNOS_VTOC_16) */
 		}
 		(void) memcpy(vtoc->v_volume, label->dkl_vtoc.v_volume,
-			LEN_DKL_VVOL);
+		    LEN_DKL_VVOL);
 		(void) memcpy((char *)vtoc->v_bootinfo,
-			(char *)label->dkl_vtoc.v_bootinfo,
-				sizeof (vtoc->v_bootinfo));
+		    (char *)label->dkl_vtoc.v_bootinfo,
+		    sizeof (vtoc->v_bootinfo));
 		(void) memcpy((char *)vtoc->v_reserved,
-			(char *)label->dkl_vtoc.v_reserved,
-				sizeof (vtoc->v_reserved));
+		    (char *)label->dkl_vtoc.v_reserved,
+		    sizeof (vtoc->v_reserved));
 		(void) memcpy((char *)vtoc->timestamp,
-			(char *)label->dkl_vtoc.v_timestamp,
-				sizeof (vtoc->timestamp));
+		    (char *)label->dkl_vtoc.v_timestamp,
+		    sizeof (vtoc->timestamp));
 		break;
 
 	default:
@@ -853,7 +864,7 @@
 	vtoc->v_nparts = V_NUMPAR;
 
 	(void) memcpy(vtoc->v_asciilabel, label->dkl_asciilabel,
-		LEN_DKL_ASCII);
+	    LEN_DKL_ASCII);
 
 #if defined(_SUNOS_VTOC_8)
 	/*
@@ -909,22 +920,21 @@
 		    (vtoc->efi_parts[i].p_size != 0)) {
 			(void) fprintf(stderr,
 "partition %d is \"unassigned\" but has a size of %llu\n", i,
-			vtoc->efi_parts[i].p_size);
+			    vtoc->efi_parts[i].p_size);
 		}
 		if (vtoc->efi_parts[i].p_tag == V_UNASSIGNED) {
 			continue;
 		}
 		if (vtoc->efi_parts[i].p_tag == V_RESERVED) {
 			if (resv_part != -1) {
-			    (void) fprintf(stderr,
-"found duplicate reserved partition at %d\n",
-				i);
+				(void) fprintf(stderr,
+"found duplicate reserved partition at %d\n", i);
 			}
 			resv_part = i;
 			if (vtoc->efi_parts[i].p_size != EFI_MIN_RESV_SIZE)
 				(void) fprintf(stderr,
 "Warning: reserved partition size must be %d sectors\n",
-				EFI_MIN_RESV_SIZE);
+				    EFI_MIN_RESV_SIZE);
 		}
 		if ((vtoc->efi_parts[i].p_start < vtoc->efi_first_u_lba) ||
 		    (vtoc->efi_parts[i].p_start > vtoc->efi_last_u_lba)) {
@@ -977,7 +987,7 @@
 	/* make sure there is a reserved partition */
 	if (resv_part == -1) {
 		(void) fprintf(stderr,
-			"no reserved partition found\n");
+		    "no reserved partition found\n");
 	}
 }
 

--- a/usr/src/cmd/format/startup.c	Mon Sep 17 23:00:44 2007 -0700
+++ b/usr/src/cmd/format/startup.c	Tue Sep 18 15:46:43 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -196,62 +196,62 @@
 			 * of the main loop so they aren't re-interpreted.
 			 */
 			switch (*ptr) {
-			    case 's':
-			    case 'S':
+			case 's':
+			case 'S':
 				option_s = 1;
 				break;
-			    case 'f':
-			    case 'F':
+			case 'f':
+			case 'F':
 				option_f = argv[next++];
 				if (next > argc)
 					goto badopt;
 				break;
-			    case 'l':
-			    case 'L':
+			case 'l':
+			case 'L':
 				option_l = argv[next++];
 				if (next > argc)
 					goto badopt;
 				break;
-			    case 'x':
-			    case 'X':
+			case 'x':
+			case 'X':
 				option_x = argv[next++];
 				if (next > argc)
 					goto badopt;
 				break;
-			    case 'd':
-			    case 'D':
+			case 'd':
+			case 'D':
 				option_d = argv[next++];
 				if (next > argc)
 					goto badopt;
 				break;
-			    case 't':
-			    case 'T':
+			case 't':
+			case 'T':
 				option_t = argv[next++];
 				if (next > argc)
 					goto badopt;
 				break;
-			    case 'p':
-			    case 'P':
+			case 'p':
+			case 'P':
 				option_p = argv[next++];
 				if (next > argc)
 					goto badopt;
 				break;
-			    case 'm':
+			case 'm':
 				option_msg = 1;
 				break;
-			    case 'M':
+			case 'M':
 				option_msg = 1;
 				diag_msg = 1;
 				break;
-			    case 'e':
+			case 'e':
 				expert_mode = 1;
 				break;
 #ifdef DEBUG
-			    case 'z':
+			case 'z':
 				dev_expert = 1;
 				break;
 #endif
-			    default:
+			default:
 badopt:
 				usage();
 				break;
@@ -324,7 +324,7 @@
 			nopened_files++;
 		} else {
 			err_print("Unable to open data file '%s' - %s.\n",
-				file_name, strerror(errno));
+			    file_name, strerror(errno));
 			fullabort();
 		}
 	}
@@ -365,7 +365,7 @@
 		 */
 		if (stat(fname, &stbuf) == -1) {
 			err_print("Unable to access '%s' - %s.\n",
-				fname, strerror(errno));
+			    fname, strerror(errno));
 		} else {
 			if (S_ISDIR(stbuf.st_mode)) {
 				if (*(p-1) != '/')
@@ -514,7 +514,7 @@
 		 * so no dangling references.
 		 */
 		search_path = build_argvlist(search_path, &path_size,
-			&path_alloc, cleaned);
+		    &path_alloc, cleaned);
 		/*
 		 * Pull in some grammar.
 		 */
@@ -659,9 +659,10 @@
 					}
 				}
 				if (i == OTHER_CTLRS) {
-				    datafile_error("Unknown controller '%s'",
-					cleaned);
-				    return;
+					datafile_error(
+					    "Unknown controller '%s'",
+					    cleaned);
+					return;
 				}
 			}
 			/*
@@ -680,7 +681,7 @@
 		val = (int)strtol(cleaned, &ptr, 0);
 		if (*ptr != '\0') {
 			datafile_error("Expecting an integer, found '%s'",
-				cleaned);
+			    cleaned);
 			return;
 		}
 		/*
@@ -1058,7 +1059,7 @@
 		 * in cylinders or blocks.
 		 */
 		if (((flags & (SUP_DISK|SUP_CTLR)) == (SUP_DISK|SUP_CTLR)) &&
-				dtype == NULL && ctype == NULL) {
+		    dtype == NULL && ctype == NULL) {
 			/*
 			 * Attempt to match the specified ctlr to a known type.
 			 */
@@ -1091,7 +1092,7 @@
 			 * Attempt to match the specified disk to a known type.
 			 */
 			for (dtype = ctype->ctype_dlist; dtype != NULL;
-						dtype = dtype->dtype_next) {
+			    dtype = dtype->dtype_next) {
 				if (strcmp(dtype->dtype_asciilabel, disk) == 0)
 					break;
 			}
@@ -1166,14 +1167,13 @@
 			status = sup_gettoken(token);
 			if (status != SUP_COMMA) {
 				datafile_error(
-					"Expecting ', ', found '%s'",
-					token);
+				    "Expecting ', ', found '%s'", token);
 				return;
 			}
 			status = sup_gettoken(token);
 			if (status != SUP_STRING) {
 				datafile_error("Expecting value, found '%s'",
-					token);
+				    token);
 				return;
 			}
 			clean_token(cleaned, token);
@@ -1190,13 +1190,13 @@
 			status = sup_gettoken(token);
 			if (status != SUP_COMMA) {
 				datafile_error("Expecting ', ', found '%s'",
-					token);
+				    token);
 				return;
 			}
 			status = sup_gettoken(token);
 			if (status != SUP_STRING) {
 				datafile_error("Expecting value, found '%s'",
-					token);
+				    token);
 				return;
 			}
 			clean_token(cleaned, token);
@@ -1209,7 +1209,7 @@
 		val1 = str2cyls(cleaned);
 		if (val1 == -1) {
 			datafile_error("Expecting an integer, found '%s'",
-				cleaned);
+			    cleaned);
 			return;
 		}
 		/*
@@ -1239,7 +1239,7 @@
 		val2 = str2blks(cleaned);
 		if (val2 == -1) {
 			datafile_error("Expecting an integer, found '%s'",
-				cleaned);
+			    cleaned);
 			return;
 		}
 		/*
@@ -1318,12 +1318,12 @@
 	 */
 	if (getcwd(curdir, sizeof (curdir)) == NULL) {
 		err_print("Cannot get current directory - %s\n",
-			strerror(errno));
+		    strerror(errno));
 		fullabort();
 	}
 	if (chdir(directory) == -1) {
 		err_print("Cannot set directory to %s - %s\n",
-			directory, strerror(errno));
+		    directory, strerror(errno));
 		fullabort();
 	}
 
@@ -1361,7 +1361,7 @@
 		 */
 		if ((dir = opendir(".")) == NULL) {
 			err_print("Cannot open %s - %s\n",
-				directory, strerror(errno));
+			    directory, strerror(errno));
 			fullabort();
 		}
 
@@ -1373,25 +1373,24 @@
 		 */
 		while ((dp = readdir(dir)) != NULL) {
 			if (strcmp(dp->d_name, ".") == 0 ||
-						strcmp(dp->d_name, "..") == 0)
+			    strcmp(dp->d_name, "..") == 0)
 				continue;
 			if (!conventional_name(dp->d_name)) {
-			    if (!fdisk_physical_name(dp->d_name)) {
-				/*
-				 * If non-conventional name represents
-				 * a link to non-s2 slice , ignore it.
-				 */
-				    if (!name_represents_wholedisk
-						(dp->d_name)) {
-					(void) strcpy(path, directory);
-					(void) strcat(path, "/");
-					(void) strcat(path, dp->d_name);
-					add_device_to_disklist(dp->d_name,
-							path);
-				    }
-			    }
+				if (!fdisk_physical_name(dp->d_name)) {
+					/*
+					 * If non-conventional name represents
+					 * a link to non-s2 slice , ignore it.
+					 */
+					if (!name_represents_wholedisk
+					    (dp->d_name)) {
+						(void) strcpy(path, directory);
+						(void) strcat(path, "/");
+						(void) strcat(path, dp->d_name);
+						add_device_to_disklist(
+						    dp->d_name, path);
+					}
+				}
 			}
-
 		}
 		rewinddir(dir);
 
@@ -1402,7 +1401,7 @@
 		 */
 		while ((dp = readdir(dir)) != NULL) {
 			if (strcmp(dp->d_name, ".") == 0 ||
-						strcmp(dp->d_name, "..") == 0)
+			    strcmp(dp->d_name, "..") == 0)
 				continue;
 			if (whole_disk_name(dp->d_name)) {
 				(void) strcpy(path, directory);
@@ -1417,7 +1416,7 @@
 		 */
 		if (closedir(dir) == -1) {
 			err_print("Cannot close directory %s - %s\n",
-				directory, strerror(errno));
+			    directory, strerror(errno));
 			fullabort();
 		}
 
@@ -1430,7 +1429,7 @@
 	 */
 	if (chdir(curdir) == -1) {
 		err_print("Cannot set directory to %s - %s\n",
-			curdir, strerror(errno));
+		    curdir, strerror(errno));
 		fullabort();
 	}
 
@@ -1469,11 +1468,11 @@
 			}
 			type = disk->disk_type;
 			nblks = type->dtype_ncyl * type->dtype_nhead *
-				type->dtype_nsect;
+			    type->dtype_nsect;
 			if (disk->label_type == L_TYPE_SOLARIS)
-			    scaled = bn2mb(nblks);
+				scaled = bn2mb(nblks);
 			else
-			    scaled = bn2mb(type->capacity);
+				scaled = bn2mb(type->capacity);
 			fmt_print("with capacity of ");
 			if (scaled > 1024.0) {
 				fmt_print("%1.2fGB\n", scaled/1024.0);
@@ -1652,7 +1651,7 @@
 		tctlr->ctype_ctype = dkinfo.dki_ctype;
 		tctlr->ctype_name = zalloc(DK_DEVLEN);
 		if (strlcpy(tctlr->ctype_name, dkinfo.dki_cname,
-			DK_DEVLEN) > DK_DEVLEN) {
+		    DK_DEVLEN) > DK_DEVLEN) {
 			/*
 			 * DKIOCINFO returned a controller name longer
 			 * than DK_DEVLEN bytes, which means more of the
@@ -1711,7 +1710,7 @@
 	 */
 	if (dkinfo.dki_ctype == DKC_SCSI_CCS) {
 		i = scsi_rdwr(DIR_READ, search_file, (daddr_t)0,
-			1, (char *)&search_label, F_SILENT, NULL);
+		    1, (char *)&search_label, F_SILENT, NULL);
 		switch (i) {
 		case DSK_RESERVED:
 			access_flags |= DSK_RESERVED;
@@ -1769,8 +1768,8 @@
 	    search_ctlr = search_ctlr->ctlr_next)
 		if (search_ctlr->ctlr_addr == dkinfo.dki_addr &&
 		    search_ctlr->ctlr_space == dkinfo.dki_space &&
-			search_ctlr->ctlr_ctype->ctype_ctype ==
-				dkinfo.dki_ctype)
+		    search_ctlr->ctlr_ctype->ctype_ctype ==
+		    dkinfo.dki_ctype)
 			break;
 	/*
 	 * If no match was found, we need to identify this ctlr.
@@ -1802,7 +1801,7 @@
 		 * to the list of found ctlrs.
 		 */
 		search_ctlr = (struct ctlr_info *)
-			zalloc(sizeof (struct ctlr_info));
+		    zalloc(sizeof (struct ctlr_info));
 		search_ctlr->ctlr_ctype = mlp->ctlr_type;
 		if (ctlr_list == NULL)
 			ctlr_list = search_ctlr;
@@ -1865,39 +1864,40 @@
 	 */
 	ctlr = search_ctlr->ctlr_ctype;
 	if ((status == -1) && (ctlr->ctype_ctype == DKC_SCSI_CCS)) {
-	    if (option_msg && diag_msg) {
-		err_print("%s: attempting auto configuration\n",
-		    search_disk->disk_name);
-	    }
-	    switch (search_disk->label_type) {
-	    case (L_TYPE_SOLARIS):
-		if (auto_sense(search_file, 0, &search_label) != NULL) {
-		/*
-		 * Auto config worked, so we now have
-		 * a valid label for the disk.  Mark
-		 * the disk as needing the label flushed.
-		 */
-			status = 0;
-			search_disk->disk_flags |=
-			    (DSK_LABEL_DIRTY | DSK_AUTO_CONFIG);
+		if (option_msg && diag_msg) {
+			err_print("%s: attempting auto configuration\n",
+			    search_disk->disk_name);
 		}
-		break;
-	    case (L_TYPE_EFI):
-		efi_disk = auto_efi_sense(search_file, &efi_info);
-		if (efi_disk != NULL) {
-		/*
-		 * Auto config worked, so we now have
-		 * a valid label for the disk.
-		 */
-			status = 0;
-			search_disk->disk_flags |=
-			    (DSK_LABEL_DIRTY | DSK_AUTO_CONFIG);
+
+		switch (search_disk->label_type) {
+		case (L_TYPE_SOLARIS):
+			if (auto_sense(search_file, 0, &search_label) != NULL) {
+			/*
+			 * Auto config worked, so we now have
+			 * a valid label for the disk.  Mark
+			 * the disk as needing the label flushed.
+			 */
+				status = 0;
+				search_disk->disk_flags |=
+				    (DSK_LABEL_DIRTY | DSK_AUTO_CONFIG);
+			}
+			break;
+		case (L_TYPE_EFI):
+			efi_disk = auto_efi_sense(search_file, &efi_info);
+			if (efi_disk != NULL) {
+				/*
+				 * Auto config worked, so we now have
+				 * a valid label for the disk.
+				 */
+				status = 0;
+				search_disk->disk_flags |=
+				    (DSK_LABEL_DIRTY | DSK_AUTO_CONFIG);
+			}
+			break;
+		default:
+			/* Should never happen */
+			break;
 		}
-		break;
-	    default:
-		    /* Should never happen */
-		break;
-	    }
 	}
 	/*
 	 * Close the file for this disk.
@@ -1958,16 +1958,18 @@
 		 * Copy the volume name, if present
 		 */
 		for (i = 0; i < search_parts->etoc->efi_nparts; i++) {
-		    if (search_parts->etoc->efi_parts[i].p_tag ==
-			V_RESERVED) {
-			    if (search_parts->etoc->efi_parts[i].p_name) {
-				bcopy(search_parts->etoc->efi_parts[i].p_name,
-				    search_disk->v_volume, LEN_DKL_VVOL);
-			    } else {
-				bzero(search_disk->v_volume, LEN_DKL_VVOL);
-			    }
-			    break;
-		    }
+			if (search_parts->etoc->efi_parts[i].p_tag ==
+			    V_RESERVED) {
+				if (search_parts->etoc->efi_parts[i].p_name) {
+					bcopy(search_parts->etoc->efi_parts[i]
+					    .p_name, search_disk->v_volume,
+					    LEN_DKL_VVOL);
+				} else {
+					bzero(search_disk->v_volume,
+					    LEN_DKL_VVOL);
+				}
+				break;
+			}
 		}
 		return;
 	}
@@ -2026,6 +2028,7 @@
 		 */
 		if ((search_ctlr->ctlr_ctype->ctype_ctype != DKC_SCSI_CCS) &&
 		    (search_ctlr->ctlr_ctype->ctype_ctype != DKC_DIRECT) &&
+		    (search_ctlr->ctlr_ctype->ctype_ctype != DKC_VBD) &&
 		    (search_ctlr->ctlr_ctype->ctype_ctype != DKC_PCMCIA_ATA)) {
 			search_dtype->dtype_flags |= DT_NEED_SPEFS;
 		}
@@ -2102,7 +2105,7 @@
 	 */
 	if (search_label.dkl_vtoc.v_version == V_VERSION) {
 		bcopy(search_label.dkl_vtoc.v_volume,
-			search_disk->v_volume, LEN_DKL_VVOL);
+		    search_disk->v_volume, LEN_DKL_VVOL);
 		search_parts->vtoc = search_label.dkl_vtoc;
 	} else {
 		bzero(search_disk->v_volume, LEN_DKL_VVOL);
@@ -2128,10 +2131,9 @@
 	dp = disk_list;
 	while (dp != NULL) {
 		if (dp->disk_dkinfo.dki_ctype == dkinfo->dki_ctype &&
-			dp->disk_dkinfo.dki_cnum == dkinfo->dki_cnum &&
-			dp->disk_dkinfo.dki_unit == dkinfo->dki_unit &&
-				strcmp(dp->disk_dkinfo.dki_dname,
-					dkinfo->dki_dname) == 0) {
+		    dp->disk_dkinfo.dki_cnum == dkinfo->dki_cnum &&
+		    dp->disk_dkinfo.dki_unit == dkinfo->dki_unit &&
+		    strcmp(dp->disk_dkinfo.dki_dname, dkinfo->dki_dname) == 0) {
 			return (1);
 		}
 		dp = dp->disk_next;
@@ -2267,10 +2269,9 @@
 	(void) close(fd);
 
 	if (disk->disk_dkinfo.dki_ctype == dkinfo.dki_ctype &&
-		disk->disk_dkinfo.dki_cnum == dkinfo.dki_cnum &&
-			disk->disk_dkinfo.dki_unit == dkinfo.dki_unit &&
-				strcmp(disk->disk_dkinfo.dki_dname,
-					dkinfo.dki_dname) == 0) {
+	    disk->disk_dkinfo.dki_cnum == dkinfo.dki_cnum &&
+	    disk->disk_dkinfo.dki_unit == dkinfo.dki_unit &&
+	    strcmp(disk->disk_dkinfo.dki_dname, dkinfo.dki_dname) == 0) {
 		return (1);
 	}
 	return (0);
@@ -2673,7 +2674,7 @@
 	}
 	if (chdir(s) == -1) {
 		err_print("cannot chdir() to %s - %s\n",
-			s, strerror(errno));
+		    s, strerror(errno));
 		goto exit;
 	}
 
@@ -2689,7 +2690,7 @@
 		}
 		if (lstat(s, &stbuf) == -1) {
 			err_print("%s: lstat() failed - %s\n",
-				s, strerror(errno));
+			    s, strerror(errno));
 			goto exit;
 		}
 		/*
@@ -2713,7 +2714,7 @@
 				 */
 				if (getcwd(dir, sizeof (dir)) == NULL) {
 					err_print("getcwd() failed - %s\n",
-						strerror(errno));
+					    strerror(errno));
 					goto exit;
 				}
 				(void) strcat(dir, "/");
@@ -2723,7 +2724,7 @@
 				 * /devices prefix, remove it.
 				 */
 				p = (strstr(dir, DEVFS_PREFIX) == dir) ?
-					dir+strlen(DEVFS_PREFIX) : dir;
+				    dir+strlen(DEVFS_PREFIX) : dir;
 				result = alloc_string(p);
 			}
 			goto exit;
@@ -2731,7 +2732,7 @@
 		i = readlink(s, buf, sizeof (buf));
 		if (i == -1) {
 			err_print("%s: readlink() failed - %s\n",
-				s, strerror(errno));
+			    s, strerror(errno));
 			goto exit;
 		}
 		level++;
@@ -2748,7 +2749,7 @@
 			*p = 0;
 			if (chdir(dir) == -1) {
 				err_print("cannot chdir() to %s - %s\n",
-					dir, strerror(errno));
+				    dir, strerror(errno));
 				goto exit;
 			}
 			(void) strcpy(s, p+1);
@@ -2760,7 +2761,7 @@
 exit:
 	if (chdir(savedir) == -1) {
 		err_print("cannot chdir() to %s - %s\n",
-			savedir, strerror(errno));
+		    savedir, strerror(errno));
 	}
 
 	return (result);
@@ -2791,7 +2792,7 @@
 	 * Allocate a simple disk list array and fill it in
 	 */
 	disks = (struct disk_info **)
-		zalloc((n+1) * sizeof (struct disk_info *));
+	    zalloc((n+1) * sizeof (struct disk_info *));
 
 	dp = disks;
 	for (d = disk_list; d != NULL; d = d->disk_next) {
@@ -2803,7 +2804,7 @@
 	 * Sort the disk list array
 	 */
 	qsort((void *) disks, n, sizeof (struct disk_info *),
-		disk_name_compare);
+	    disk_name_compare);
 
 	/*
 	 * Rebuild the linked list disk list structure