From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZFev-0006sL-W2 for qemu-devel@nongnu.org; Thu, 24 Oct 2013 03:48:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZFeq-0004WO-5f for qemu-devel@nongnu.org; Thu, 24 Oct 2013 03:48:45 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:49534 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZFep-0004VR-Qp for qemu-devel@nongnu.org; Thu, 24 Oct 2013 03:48:40 -0400 From: Peter Lieven Date: Thu, 24 Oct 2013 09:46:45 +0200 Message-Id: <1382600811-20043-12-git-send-email-pl@kamp.de> In-Reply-To: <1382600811-20043-1-git-send-email-pl@kamp.de> References: <1382600811-20043-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv6 11/17] iscsi: set limits in BlockDriverState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, Peter Lieven , ronniesahlberg@gmail.com, pbonzini@redhat.com Reviewed-by: Eric Blake Signed-off-by: Peter Lieven --- block/iscsi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index 47b9cc9..c0465aa 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1367,6 +1367,20 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, sizeof(struct scsi_inquiry_block_limits)); scsi_free_scsi_task(task); task = NULL; + + if (iscsilun->bl.max_unmap < 0xffffffff) { + bs->bl.max_discard = sector_lun2qemu(iscsilun->bl.max_unmap, + iscsilun); + } + bs->bl.discard_alignment = sector_lun2qemu(iscsilun->bl.opt_unmap_gran, + iscsilun); + + if (iscsilun->bl.max_ws_len < 0xffffffff) { + bs->bl.max_write_zeroes = sector_lun2qemu(iscsilun->bl.max_ws_len, + iscsilun); + } + bs->bl.write_zeroes_alignment = sector_lun2qemu(iscsilun->bl.opt_unmap_gran, + iscsilun); } #if defined(LIBISCSI_FEATURE_NOP_COUNTER) -- 1.7.9.5