From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvgn-0007DT-8C for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLvgg-0001w5-Ie for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:37 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:57986 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvgg-0001vl-7L for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:51:30 -0400 From: Peter Lieven Date: Tue, 17 Sep 2013 15:48:41 +0200 Message-Id: <1379425736-11326-6-git-send-email-pl@kamp.de> In-Reply-To: <1379425736-11326-1-git-send-email-pl@kamp.de> References: <1379425736-11326-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv2 05/20] block/raw: add bdrv_has_discard_zeroes and bdrv_has_discard_write_zeroes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com 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 bd4811b..0bfa5fc 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 int raw_has_discard_zeroes(BlockDriverState *bs) +{ + return bdrv_has_discard_zeroes(bs->file); +} + +static int raw_has_discard_write_zeroes(BlockDriverState *bs) +{ + return bdrv_has_discard_write_zeroes(bs->file); +} + static int raw_create(const char *filename, QEMUOptionParameter *options) { return bdrv_create_file(filename, options); @@ -155,28 +165,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) -- 1.7.9.5