From patchwork Tue Sep 17 13:48:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 275474 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 677622C009A for ; Tue, 17 Sep 2013 23:57:52 +1000 (EST) Received: from localhost ([::1]:41334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvmo-0008CO-GS for incoming@patchwork.ozlabs.org; Tue, 17 Sep 2013 09:57:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvgq-0007K1-Ky for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLvgk-0001wy-19 for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:40 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:36764 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvgj-0001wi-M5 for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:33 -0400 Received: (qmail 23483 invoked by uid 89); 17 Sep 2013 13:51:32 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.97.8/17868. hbedv: 8.2.12.120/7.11.102.228. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 4.007968 secs); 17 Sep 2013 13:51:32 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 17 Sep 2013 13:51:28 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 62965206B2; Tue, 17 Sep 2013 15:49:15 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id DA0CB5FA22; Tue, 17 Sep 2013 15:49:15 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 17 Sep 2013 15:48:47 +0200 Message-Id: <1379425736-11326-12-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1379425736-11326-1-git-send-email-pl@kamp.de> References: <1379425736-11326-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv2 11/20] iscsi: add bdrv_has_discard_zeroes and bdrv_has_discard_write_zeroes 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 Signed-off-by: Peter Lieven Reviewed-by: Eric Blake --- block/iscsi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 21b1ecf..46c7c8d 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1440,6 +1440,18 @@ static int iscsi_has_zero_init(BlockDriverState *bs) return 0; } +static int iscsi_has_discard_zeroes(BlockDriverState *bs) +{ + IscsiLun *iscsilun = bs->opaque; + return iscsilun->lbprz; +} + +static int iscsi_has_discard_write_zeroes(BlockDriverState *bs) +{ + IscsiLun *iscsilun = bs->opaque; + return iscsilun->lbprz && iscsilun->lbp.lbpws; +} + static int iscsi_create(const char *filename, QEMUOptionParameter *options) { int ret = 0; @@ -1522,7 +1534,9 @@ static BlockDriver bdrv_iscsi = { .bdrv_aio_writev = iscsi_aio_writev, .bdrv_aio_flush = iscsi_aio_flush, - .bdrv_has_zero_init = iscsi_has_zero_init, + .bdrv_has_zero_init = iscsi_has_zero_init, + .bdrv_has_discard_zeroes = iscsi_has_discard_zeroes , + .bdrv_has_discard_write_zeroes = iscsi_has_discard_write_zeroes, #ifdef __linux__ .bdrv_ioctl = iscsi_ioctl,