Received: from eggs.gnu.org ([2001:4830:134:3::10]:47883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYr37-0006EE-6S for qemu-devel@nongnu.org; Tue, 30 Sep 2014 02:36:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYr31-000552-CG for qemu-devel@nongnu.org; Tue, 30 Sep 2014 02:36:37 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:43242 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYr31-00052W-3D for qemu-devel@nongnu.org; Tue, 30 Sep 2014 02:36:31 -0400 From: Peter Lieven Date: Tue, 30 Sep 2014 08:35:18 +0200 Message-Id: <1412058919-13209-3-git-send-email-pl@kamp.de> In-Reply-To: <1412058919-13209-1-git-send-email-pl@kamp.de> References: <1412058919-13209-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv3 2/3] block/iscsi: set max_transfer_length List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@irqsave.net, stefanha@redhat.com, Peter Lieven , mreitz@redhat.com, ronniesahlberg@gmail.com, pbonzini@redhat.com the limit of 0xffffff for 16 byte CDBs is intentional to avoid overflows on 32-bit architectures. Signed-off-by: Peter Lieven Reviewed-by: Ronnie Sahlberg --- block/iscsi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 5c72ffe..16fe8bc 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1441,10 +1441,18 @@ static void iscsi_close(BlockDriverState *bs) static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp) { - IscsiLun *iscsilun = bs->opaque; - /* We don't actually refresh here, but just return data queried in * iscsi_open(): iscsi targets don't change their limits. */ + + IscsiLun *iscsilun = bs->opaque; + uint32_t max_xfer_len = iscsilun->use_16_for_rw ? 0xffffff : 0xffff; + + if (iscsilun->bl.max_xfer_len) { + max_xfer_len = MIN(max_xfer_len, iscsilun->bl.max_xfer_len); + } + + bs->bl.max_transfer_length = sector_lun2qemu(max_xfer_len, iscsilun); + if (iscsilun->lbp.lbpu) { if (iscsilun->bl.max_unmap < 0xffffffff) { bs->bl.max_discard = sector_lun2qemu(iscsilun->bl.max_unmap, -- 1.7.9.5