From patchwork Tue Oct 8 11:58: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: 281456 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 E486B2C0091 for ; Tue, 8 Oct 2013 23:41:45 +1100 (EST) Received: from localhost ([::1]:36047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTW0v-00044K-52 for incoming@patchwork.ozlabs.org; Tue, 08 Oct 2013 08:03:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTVxo-00016U-7B for qemu-devel@nongnu.org; Tue, 08 Oct 2013 08:00:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTVxe-0003x7-1k for qemu-devel@nongnu.org; Tue, 08 Oct 2013 08:00:32 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:42663 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTVxd-0003wm-OH for qemu-devel@nongnu.org; Tue, 08 Oct 2013 08:00:22 -0400 Received: (qmail 5401 invoked by uid 89); 8 Oct 2013 12:00:17 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/17948. hbedv: 8.2.12.126/7.11.106.104. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.091661 secs); 08 Oct 2013 12:00:17 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 8 Oct 2013 12:00:16 -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 B0E5A206B2; Tue, 8 Oct 2013 13:58:10 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 98D7E612C6; Tue, 8 Oct 2013 13:58:12 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 8 Oct 2013 13:58:05 +0200 Message-Id: <1381233491-17019-12-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1381233491-17019-1-git-send-email-pl@kamp.de> References: <1381233491-17019-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] [PATCHv4 11/17] 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 Reviewed-by: Eric Blake Signed-off-by: Peter Lieven --- block/iscsi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 8ed2274..f0ac620 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1449,6 +1449,18 @@ static int iscsi_has_zero_init(BlockDriverState *bs) return 0; } +static bool iscsi_has_discard_zeroes(BlockDriverState *bs) +{ + IscsiLun *iscsilun = bs->opaque; + return !!iscsilun->lbprz; +} + +static bool 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, Error **errp) { @@ -1535,7 +1547,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,