From patchwork Sun Oct 20 15:43:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 285016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7056D2C00F8 for ; Mon, 21 Oct 2013 02:50:32 +1100 (EST) Received: from localhost ([::1]:36613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXvGw-0006yX-Jg for incoming@patchwork.ozlabs.org; Sun, 20 Oct 2013 11:50:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXvAf-0004qX-2w for qemu-devel@nongnu.org; Sun, 20 Oct 2013 11:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VXvAZ-0003iG-45 for qemu-devel@nongnu.org; Sun, 20 Oct 2013 11:44:01 -0400 Received: from ssl.dlhnet.de ([91.198.192.8]:40555 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXvAY-0003i8-PN for qemu-devel@nongnu.org; Sun, 20 Oct 2013 11:43:55 -0400 Received: from localhost (localhost [127.0.0.1]) by ssl.dlh.net (Postfix) with ESMTP id 52CBC14E753; Sun, 20 Oct 2013 17:43:54 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ssl.dlh.net Received: from ssl.dlh.net ([127.0.0.1]) by localhost (ssl.dlh.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4cJJgSoN5mCF; Sun, 20 Oct 2013 17:43:50 +0200 (CEST) Received: from trinity64-ssd (unknown [82.141.7.8]) by ssl.dlh.net (Postfix) with ESMTP id 4054014E759; Sun, 20 Oct 2013 17:43:42 +0200 (CEST) Received: by trinity64-ssd (Postfix, from userid 1000) id 1F9C42021BC; Sun, 20 Oct 2013 17:43:12 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sun, 20 Oct 2013 17:43:05 +0200 Message-Id: <1382283791-11181-12-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1382283791-11181-1-git-send-email-pl@kamp.de> References: <1382283791-11181-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 91.198.192.8 Cc: Kevin Wolf , Stefan Hajnoczi , Peter Lieven , ronniesahlberg@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv5 11/17] iscsi: set limits in BlockDriverState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)