diff options
| author | bo zhou - Sun Microsystems - Beijing China <Bo.Zhou@Sun.COM> | 2008-10-23 17:47:08 +0800 |
|---|---|---|
| committer | bo zhou - Sun Microsystems - Beijing China <Bo.Zhou@Sun.COM> | 2008-10-23 17:47:08 +0800 |
| commit | 3959f00f3b18fde1766ba43723132b0c655a6a05 (patch) | |
| tree | 86ef10dd65d9f9be9a878a4fb1f2b93d2881fa21 /usr/src/cmd/format | |
| parent | dd1f21708d9161658f6c7eaf3605cdab99921396 (diff) | |
| download | illumos-joyent-3959f00f3b18fde1766ba43723132b0c655a6a05.tar.gz | |
6688597 label EFI to virtual disk failed on pv domU
Diffstat (limited to 'usr/src/cmd/format')
| -rw-r--r-- | usr/src/cmd/format/auto_sense.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/usr/src/cmd/format/auto_sense.c b/usr/src/cmd/format/auto_sense.c index 9ea4cd0909..739a4d5f4b 100644 --- a/usr/src/cmd/format/auto_sense.c +++ b/usr/src/cmd/format/auto_sense.c @@ -1803,10 +1803,11 @@ find_scsi_ctlr_type() mlp = controlp; while (mlp != NULL) { - if (mlp->ctlr_type->ctype_ctype == DKC_SCSI_CCS) { + if (mlp->ctlr_type->ctype_ctype == DKC_SCSI_CCS || + mlp->ctlr_type->ctype_ctype == DKC_VBD) { return (mlp->ctlr_type); } - mlp = mlp->next; + mlp = mlp->next; } impossible("no SCSI controller type"); @@ -1827,15 +1828,16 @@ find_scsi_ctlr_info( { struct ctlr_info *ctlr; - if (dkinfo->dki_ctype != DKC_SCSI_CCS) { + if (dkinfo->dki_ctype != DKC_SCSI_CCS && + dkinfo->dki_ctype != DKC_VBD) { return (NULL); } for (ctlr = ctlr_list; ctlr != NULL; ctlr = ctlr->ctlr_next) { if (ctlr->ctlr_addr == dkinfo->dki_addr && - ctlr->ctlr_space == dkinfo->dki_space && - ctlr->ctlr_ctype->ctype_ctype == - DKC_SCSI_CCS) { + ctlr->ctlr_space == dkinfo->dki_space && + (ctlr->ctlr_ctype->ctype_ctype == DKC_SCSI_CCS || + ctlr->ctlr_ctype->ctype_ctype == DKC_VBD)) { return (ctlr); } } @@ -2049,7 +2051,8 @@ find_scsi_disk_info( struct dk_cinfo *dp; for (disk = disk_list; disk != NULL; disk = disk->disk_next) { - assert(dkinfo->dki_ctype == DKC_SCSI_CCS); + assert(dkinfo->dki_ctype == DKC_SCSI_CCS || + dkinfo->dki_ctype == DKC_VBD); dp = &disk->disk_dkinfo; if (dp->dki_ctype == dkinfo->dki_ctype && dp->dki_cnum == dkinfo->dki_cnum && |