Received: from eggs.gnu.org ([2001:4830:134:3::10]:55782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvgh-00073X-Mi for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLvga-0001um-Oz for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:31 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:60961 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvga-0001uU-8u for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:24 -0400 From: Peter Lieven Date: Tue, 17 Sep 2013 15:48:46 +0200 Message-Id: <1379425736-11326-11-git-send-email-pl@kamp.de> In-Reply-To: <1379425736-11326-1-git-send-email-pl@kamp.de> References: <1379425736-11326-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv2 10/20] 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, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Signed-off-by: Peter Lieven --- block/iscsi.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index aabcddb..21b1ecf 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1362,6 +1362,16 @@ 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->max_discard = sector_lun2qemu(iscsilun->bl.max_unmap, iscsilun); + } + bs->discard_alignment = sector_lun2qemu(iscsilun->bl.opt_unmap_gran, iscsilun); + + if (iscsilun->bl.max_ws_len < 0xffffffff) { + bs->max_write_zeroes = sector_lun2qemu(iscsilun->bl.max_ws_len, iscsilun); + } + bs->write_zeroes_alignment = sector_lun2qemu(iscsilun->bl.opt_unmap_gran, iscsilun); } #if defined(LIBISCSI_FEATURE_NOP_COUNTER) -- 1.7.9.5