From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2KUT-0007kw-JW for qemu-devel@nongnu.org; Fri, 27 Nov 2015 09:59:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2KUP-0001rE-Gg for qemu-devel@nongnu.org; Fri, 27 Nov 2015 09:59:13 -0500 Received: from mx2.suse.de ([195.135.220.15]:48992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2KUP-0001qt-Ae for qemu-devel@nongnu.org; Fri, 27 Nov 2015 09:59:09 -0500 From: Hannes Reinecke Date: Fri, 27 Nov 2015 15:58:59 +0100 Message-Id: <1448636346-24641-2-git-send-email-hare@suse.de> In-Reply-To: <1448636346-24641-1-git-send-email-hare@suse.de> References: <1448636346-24641-1-git-send-email-hare@suse.de> Subject: [Qemu-devel] [PATCH 1/8] scsi-disk: Add 'port_group' property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Johannes Thumshirn , Stefan Hajnoczi , Hannes Reinecke , qemu-devel@nongnu.org, Alexander Graf Each SCSI target port can have a 'target port group' identifier. This identifier is used for management software to group individual I_T_L nexus together eg when assembling a multipath topology. Signed-off-by: Hannes Reinecke --- hw/scsi/scsi-disk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 4797d83..f544f43 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -79,6 +79,7 @@ struct SCSIDiskState uint64_t wwn; uint64_t port_wwn; uint16_t port_index; + uint16_t port_group; uint64_t max_unmap_size; uint64_t max_io_size; QEMUBH *bh; @@ -658,6 +659,14 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) stw_be_p(&outbuf[buflen + 2], s->port_index); buflen += 4; } + if (s->port_group) { + outbuf[buflen++] = 0x61; // SAS / Binary + outbuf[buflen++] = 0x95; // PIV / Target port / target port group + outbuf[buflen++] = 0; // reserved + outbuf[buflen++] = 4; + stw_be_p(&outbuf[buflen + 2], s->port_group); + buflen += 4; + } break; } case 0xb0: /* block limits */ @@ -2670,6 +2679,7 @@ static Property scsi_hd_properties[] = { 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_UINT16("port_group", SCSIDiskState, port_group, 0), DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size, DEFAULT_MAX_UNMAP_SIZE), DEFINE_PROP_UINT64("max_io_size", SCSIDiskState, max_io_size, @@ -2720,6 +2730,7 @@ static Property scsi_cd_properties[] = { 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_UINT16("port_group", SCSIDiskState, port_group, 0), DEFINE_PROP_UINT64("max_io_size", SCSIDiskState, max_io_size, DEFAULT_MAX_IO_SIZE), DEFINE_PROP_END_OF_LIST(), @@ -2785,6 +2796,7 @@ static Property scsi_disk_properties[] = { 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_UINT16("port_group", SCSIDiskState, port_group, 0), DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size, DEFAULT_MAX_UNMAP_SIZE), DEFINE_PROP_UINT64("max_io_size", SCSIDiskState, max_io_size, -- 1.8.4.5