Print this page
9250 remove xpv related code from bootadm
@@ -85,11 +85,10 @@
#define BAM_ENTRY_CHAINLOADER 0x04 /* chainloader entry; do not disturb */
#define BAM_ENTRY_ROOT 0x08 /* entry has a root line */
#define BAM_ENTRY_FAILSAFE 0x10 /* failsafe entry */
#define BAM_ENTRY_DBOOT 0x20 /* Is dboot (normal or failsafe) */
#define BAM_ENTRY_32BIT 0x40 /* Is a 32-bit entry */
-#define BAM_ENTRY_HV 0x80 /* Is a hypervisor entry */
#define BAM_ENTRY_FINDROOT 0x100 /* entry has a findroot line */
#define BAM_ENTRY_MULTIBOOT 0x200 /* is multiboot (normal or failsafe) */
#define BAM_ENTRY_64BIT 0x400 /* Is a 64-bit entry */
#define BAM_ENTRY_UPGFSKERNEL 0x800 /* Upgrade failsafe kernel entry */
@@ -108,12 +107,11 @@
typedef enum {
BAM_ERROR = -1, /* Must be negative. add_boot_entry() depends on it */
BAM_SUCCESS = 0,
BAM_WRITE = 2,
- BAM_MSG, /* Used by upgrade_menu() */
- BAM_NOCHANGE /* Used by cvt_to_hyper()/cvt_to_metal() */
+ BAM_MSG /* Used by upgrade_menu() */
} error_t;
/*
* Menu related
* menu_cmd_t and menu_cmds must be kept in sync
@@ -145,17 +143,10 @@
BAM_DIRECT_NOT_SET,
BAM_DIRECT_MULTIBOOT,
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;
-
/* Is there findroot capability present ? */
typedef enum {
BAM_FINDROOT_UNKNOWN,
BAM_FINDROOT_ABSENT,
BAM_FINDROOT_PRESENT
@@ -183,20 +174,17 @@
} zfs_mnted_t;
extern int bam_verbose;
extern int bam_force;
extern direct_or_multi_t bam_direct;
-extern hv_t bam_is_hv;
extern findroot_t bam_is_findroot;
extern int bam_debug;
extern void bam_add_line(menu_t *mp, entry_t *entry, line_t *prev, line_t *lp);
extern void update_numbering(menu_t *mp);
extern error_t set_global(menu_t *, char *, int);
extern error_t upgrade_menu(menu_t *, char *, char *);
-extern error_t cvt_to_hyper(menu_t *, char *, char *);
-extern error_t cvt_to_metal(menu_t *, char *, char *);
extern error_t check_subcmd_and_options(char *, char *, subcmd_defn_t *,
error_t (**fp)());
extern char *mount_top_dataset(char *pool, zfs_mnted_t *mnted);
extern void elide_trailing_slash(const char *, char *, size_t);
extern int umount_top_dataset(char *, zfs_mnted_t, char *);
@@ -250,13 +238,10 @@
#define BAM_LIBBE_FTR "============ End of LIBBE entry ============="
/* Title used for failsafe entries */
#define FAILSAFE_TITLE "Solaris failsafe"
-/* Title used for hv entries */
-#define NEW_HV_ENTRY "Solaris xVM"
-
/* ZFS boot option */
#define ZFS_BOOT "-B $ZFS-BOOTFS"
/* multiboot */
#define MULTI_BOOT "/platform/i86pc/multiboot"
@@ -277,13 +262,10 @@
#define DIRECT_BOOT_PREFIX "/platform/i86pc/"
#define KERNEL_PREFIX "/platform/i86pc/"
#define AMD_UNIX_SPACE "/amd64/unix "
#define UNIX_SPACE "/unix "
-/* xVM kernels */
-#define XEN_KERNEL_SUBSTR "xen.gz"
-
/* Boot archives */
#define ARCHIVE_PREFIX "/platform/"
#define ARCHIVE_SUFFIX "/boot_archive"
#define CACHEDIR_SUFFIX "/archive_cache"
#define UPDATEDIR_SUFFIX "/updates"
@@ -297,18 +279,10 @@
#define CACHEDIR_32 "/platform/i86pc/archive_cache"
#define CACHEDIR_64 "/platform/i86pc/amd64/archive_cache"
#define UPDATEDIR_32 "/platform/i86pc/updates"
#define UPDATEDIR_64 "/platform/i86pc/amd64/updates"
-/* Hypervisors */
-#define XEN_64 "/boot/amd64/xen.gz"
-#define XEN_MENU "/boot/$ISADIR/xen.gz"
-#define HYPERVISOR_KERNEL "/platform/i86xpv/kernel/$ISADIR/unix"
-#define XEN_KERNEL_MODULE_LINE HYPERVISOR_KERNEL " " HYPERVISOR_KERNEL
-#define XEN_KERNEL_MODULE_LINE_ZFS \
- HYPERVISOR_KERNEL " " HYPERVISOR_KERNEL " " ZFS_BOOT
-
/* Helpers */
#define MKISOFS_PATH "/usr/bin/mkisofs"
#define DD_PATH_USR "/usr/bin/dd"
#define LOCKFS_PATH "/usr/sbin/lockfs"