From patchwork Tue Oct 8 11:57:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 281420 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 B63952C00A7 for ; Tue, 8 Oct 2013 23:00:03 +1100 (EST) Received: from localhost ([::1]:35957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTVxJ-0007rM-46 for incoming@patchwork.ozlabs.org; Tue, 08 Oct 2013 08:00:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTVwh-0007q4-KB for qemu-devel@nongnu.org; Tue, 08 Oct 2013 07:59:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTVwb-0003F2-Tr for qemu-devel@nongnu.org; Tue, 08 Oct 2013 07:59:23 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:39883 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTVwb-0003Do-Ii for qemu-devel@nongnu.org; Tue, 08 Oct 2013 07:59:17 -0400 Received: (qmail 5203 invoked by uid 89); 8 Oct 2013 11:59:16 -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 4.79617 secs); 08 Oct 2013 11:59:16 -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 11:59:10 -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 94C84206AB; Tue, 8 Oct 2013 13:58:10 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 78E98614F4; Tue, 8 Oct 2013 13:58:12 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 8 Oct 2013 13:57:59 +0200 Message-Id: <1381233491-17019-6-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 05/17] block/raw: 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/raw_bsd.c | 56 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/block/raw_bsd.c b/block/raw_bsd.c index d5ab295..8dc7bba 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -131,6 +131,16 @@ static int raw_has_zero_init(BlockDriverState *bs) return bdrv_has_zero_init(bs->file); } +static bool raw_has_discard_zeroes(BlockDriverState *bs) +{ + return bdrv_has_discard_zeroes(bs->file); +} + +static bool raw_has_discard_write_zeroes(BlockDriverState *bs) +{ + return bdrv_has_discard_write_zeroes(bs->file); +} + static int raw_create(const char *filename, QEMUOptionParameter *options, Error **errp) { @@ -165,28 +175,30 @@ static int raw_probe(const uint8_t *buf, int buf_size, const char *filename) } static BlockDriver bdrv_raw = { - .format_name = "raw", - .bdrv_probe = &raw_probe, - .bdrv_reopen_prepare = &raw_reopen_prepare, - .bdrv_open = &raw_open, - .bdrv_close = &raw_close, - .bdrv_create = &raw_create, - .bdrv_co_readv = &raw_co_readv, - .bdrv_co_writev = &raw_co_writev, - .bdrv_co_write_zeroes = &raw_co_write_zeroes, - .bdrv_co_discard = &raw_co_discard, - .bdrv_co_get_block_status = &raw_co_get_block_status, - .bdrv_truncate = &raw_truncate, - .bdrv_getlength = &raw_getlength, - .bdrv_get_info = &raw_get_info, - .bdrv_is_inserted = &raw_is_inserted, - .bdrv_media_changed = &raw_media_changed, - .bdrv_eject = &raw_eject, - .bdrv_lock_medium = &raw_lock_medium, - .bdrv_ioctl = &raw_ioctl, - .bdrv_aio_ioctl = &raw_aio_ioctl, - .create_options = &raw_create_options[0], - .bdrv_has_zero_init = &raw_has_zero_init + .format_name = "raw", + .bdrv_probe = &raw_probe, + .bdrv_reopen_prepare = &raw_reopen_prepare, + .bdrv_open = &raw_open, + .bdrv_close = &raw_close, + .bdrv_create = &raw_create, + .bdrv_co_readv = &raw_co_readv, + .bdrv_co_writev = &raw_co_writev, + .bdrv_co_write_zeroes = &raw_co_write_zeroes, + .bdrv_co_discard = &raw_co_discard, + .bdrv_co_get_block_status = &raw_co_get_block_status, + .bdrv_truncate = &raw_truncate, + .bdrv_getlength = &raw_getlength, + .bdrv_get_info = &raw_get_info, + .bdrv_is_inserted = &raw_is_inserted, + .bdrv_media_changed = &raw_media_changed, + .bdrv_eject = &raw_eject, + .bdrv_lock_medium = &raw_lock_medium, + .bdrv_ioctl = &raw_ioctl, + .bdrv_aio_ioctl = &raw_aio_ioctl, + .create_options = &raw_create_options[0], + .bdrv_has_zero_init = &raw_has_zero_init, + .bdrv_has_discard_zeroes = &raw_has_discard_zeroes, + .bdrv_has_discard_write_zeroes = &raw_has_discard_write_zeroes, }; static void bdrv_raw_init(void)