scsi-disk: Add support for port WWN and index descriptors in VPD page 83h
To make a VM more convincing to my application, it's useful to be able to add a port WWN and relative target port index to the descriptors returned for VPD page 83h. Add device properties to allow setting these, and return them from INQUIRY commands. Signed-off-by: Roland Dreier <roland@purestorage.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
24d3bd67ac
commit
64cc22841e
|
@ -75,6 +75,8 @@ struct SCSIDiskState
|
||||||
bool media_event;
|
bool media_event;
|
||||||
bool eject_request;
|
bool eject_request;
|
||||||
uint64_t wwn;
|
uint64_t wwn;
|
||||||
|
uint64_t port_wwn;
|
||||||
|
uint16_t port_index;
|
||||||
uint64_t max_unmap_size;
|
uint64_t max_unmap_size;
|
||||||
QEMUBH *bh;
|
QEMUBH *bh;
|
||||||
char *version;
|
char *version;
|
||||||
|
@ -620,6 +622,24 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
|
||||||
stq_be_p(&outbuf[buflen], s->wwn);
|
stq_be_p(&outbuf[buflen], s->wwn);
|
||||||
buflen += 8;
|
buflen += 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (s->port_wwn) {
|
||||||
|
outbuf[buflen++] = 0x61; // SAS / Binary
|
||||||
|
outbuf[buflen++] = 0x93; // PIV / Target port / NAA
|
||||||
|
outbuf[buflen++] = 0; // reserved
|
||||||
|
outbuf[buflen++] = 8;
|
||||||
|
stq_be_p(&outbuf[buflen], s->port_wwn);
|
||||||
|
buflen += 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->port_index) {
|
||||||
|
outbuf[buflen++] = 0x61; // SAS / Binary
|
||||||
|
outbuf[buflen++] = 0x94; // PIV / Target port / relative target port
|
||||||
|
outbuf[buflen++] = 0; // reserved
|
||||||
|
outbuf[buflen++] = 4;
|
||||||
|
stw_be_p(&outbuf[buflen + 2], s->port_index);
|
||||||
|
buflen += 4;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 0xb0: /* block limits */
|
case 0xb0: /* block limits */
|
||||||
|
@ -2539,6 +2559,8 @@ static Property scsi_hd_properties[] = {
|
||||||
DEFINE_PROP_BIT("dpofua", SCSIDiskState, features,
|
DEFINE_PROP_BIT("dpofua", SCSIDiskState, features,
|
||||||
SCSI_DISK_F_DPOFUA, false),
|
SCSI_DISK_F_DPOFUA, false),
|
||||||
DEFINE_PROP_UINT64("wwn", SCSIDiskState, wwn, 0),
|
DEFINE_PROP_UINT64("wwn", SCSIDiskState, wwn, 0),
|
||||||
|
DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, port_wwn, 0),
|
||||||
|
DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 0),
|
||||||
DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size,
|
DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size,
|
||||||
DEFAULT_MAX_UNMAP_SIZE),
|
DEFAULT_MAX_UNMAP_SIZE),
|
||||||
DEFINE_BLOCK_CHS_PROPERTIES(SCSIDiskState, qdev.conf),
|
DEFINE_BLOCK_CHS_PROPERTIES(SCSIDiskState, qdev.conf),
|
||||||
|
@ -2587,6 +2609,8 @@ static const TypeInfo scsi_hd_info = {
|
||||||
static Property scsi_cd_properties[] = {
|
static Property scsi_cd_properties[] = {
|
||||||
DEFINE_SCSI_DISK_PROPERTIES(),
|
DEFINE_SCSI_DISK_PROPERTIES(),
|
||||||
DEFINE_PROP_UINT64("wwn", SCSIDiskState, wwn, 0),
|
DEFINE_PROP_UINT64("wwn", SCSIDiskState, wwn, 0),
|
||||||
|
DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, port_wwn, 0),
|
||||||
|
DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 0),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2650,6 +2674,8 @@ static Property scsi_disk_properties[] = {
|
||||||
DEFINE_PROP_BIT("dpofua", SCSIDiskState, features,
|
DEFINE_PROP_BIT("dpofua", SCSIDiskState, features,
|
||||||
SCSI_DISK_F_DPOFUA, false),
|
SCSI_DISK_F_DPOFUA, false),
|
||||||
DEFINE_PROP_UINT64("wwn", SCSIDiskState, wwn, 0),
|
DEFINE_PROP_UINT64("wwn", SCSIDiskState, wwn, 0),
|
||||||
|
DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, port_wwn, 0),
|
||||||
|
DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 0),
|
||||||
DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size,
|
DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size,
|
||||||
DEFAULT_MAX_UNMAP_SIZE),
|
DEFAULT_MAX_UNMAP_SIZE),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
|
Loading…
Reference in a new issue