david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: push WWN fields up to SCSIDevice

Browse Source 
SAS adapters need to access them in order to publish the SAS addresses
of the end devices connected to them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-01-12 11:47:00 +01:00
parent a0aa44b488
commit 2ecab4084f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/scsi/scsi-disk.c
View File

@ -77,8 +77,6 @@ struct SCSIDiskState
bool media_changed; bool media_changed;
bool media_event; bool media_event;
bool eject_request; bool eject_request;
uint64_t wwn;
uint64_t port_wwn;
uint16_t port_index; uint16_t port_index;
uint64_t max_unmap_size; uint64_t max_unmap_size;
uint64_t max_io_size; uint64_t max_io_size;
@ -633,21 +631,21 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
memcpy(outbuf+buflen, str, id_len); memcpy(outbuf+buflen, str, id_len);
buflen += id_len; buflen += id_len;
if (s->wwn) { if (s->qdev.wwn) {
outbuf[buflen++] = 0x1; // Binary outbuf[buflen++] = 0x1; // Binary
outbuf[buflen++] = 0x3; // NAA outbuf[buflen++] = 0x3; // NAA
outbuf[buflen++] = 0; // reserved outbuf[buflen++] = 0; // reserved
outbuf[buflen++] = 8; outbuf[buflen++] = 8;
stq_be_p(&outbuf[buflen], s->wwn); stq_be_p(&outbuf[buflen], s->qdev.wwn);
buflen += 8; buflen += 8;
} }
if (s->port_wwn) { if (s->qdev.port_wwn) {
outbuf[buflen++] = 0x61; // SAS / Binary outbuf[buflen++] = 0x61; // SAS / Binary
outbuf[buflen++] = 0x93; // PIV / Target port / NAA outbuf[buflen++] = 0x93; // PIV / Target port / NAA
outbuf[buflen++] = 0; // reserved outbuf[buflen++] = 0; // reserved
outbuf[buflen++] = 8; outbuf[buflen++] = 8;
stq_be_p(&outbuf[buflen], s->port_wwn); stq_be_p(&outbuf[buflen], s->qdev.port_wwn);
buflen += 8; buflen += 8;
} }
@ -2668,8 +2666,8 @@ static Property scsi_hd_properties[] = {
SCSI_DISK_F_REMOVABLE, false), SCSI_DISK_F_REMOVABLE, false),
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, qdev.wwn, 0),
DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, port_wwn, 0), DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, qdev.port_wwn, 0),
DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 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),
@ -2718,8 +2716,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, qdev.wwn, 0),
DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, port_wwn, 0), DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, qdev.port_wwn, 0),
DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 0), DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 0),
DEFINE_PROP_UINT64("max_io_size", SCSIDiskState, max_io_size, DEFINE_PROP_UINT64("max_io_size", SCSIDiskState, max_io_size,
DEFAULT_MAX_IO_SIZE), DEFAULT_MAX_IO_SIZE),
@ -2783,8 +2781,8 @@ static Property scsi_disk_properties[] = {
SCSI_DISK_F_REMOVABLE, false), SCSI_DISK_F_REMOVABLE, false),
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, qdev.wwn, 0),
DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, port_wwn, 0), DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, qdev.port_wwn, 0),
DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 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),

2
include/hw/scsi/scsi.h
View File

@ -108,6 +108,8 @@ struct SCSIDevice
int blocksize; int blocksize;
int type; int type;
uint64_t max_lba; uint64_t max_lba;
uint64_t wwn;
uint64_t port_wwn;
}; };
extern const VMStateDescription vmstate_scsi_device; extern const VMStateDescription vmstate_scsi_device;