From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNOVC-0001qS-3R for qemu-devel@nongnu.org; Fri, 29 Aug 2014 11:54:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNOV6-0006zE-5D for qemu-devel@nongnu.org; Fri, 29 Aug 2014 11:54:14 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:44103 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNOV5-0006yt-Pb for qemu-devel@nongnu.org; Fri, 29 Aug 2014 11:54:08 -0400 Date: Fri, 29 Aug 2014 17:53:18 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140829155318.GA16755@irqsave.net> References: <1409274040-20304-1-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1409274040-20304-1-git-send-email-famz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4] block: Introduce "null" driver List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Kevin Wolf , benoit.canet@irqsave.net, qemu-devel@nongnu.org, armbru@redhat.com, Stefan Hajnoczi , pbonzini@redhat.com The Friday 29 Aug 2014 =E0 09:00:40 (+0800), Fam Zheng wrote : > This is an analogue to Linux null_blk. It can be used for testing or > benchmarking block device emulation and general block layer > functionalities such as coroutines and throttling, where disk IO is not > necessary or wanted. >=20 > Use null:// for AIO version, and null-co:// for coroutine version. >=20 > Signed-off-by: Fam Zheng >=20 > --- > V4: Add "#optional". (Eric) > Add null_aio_common. (Benoit) > Add null-co in json schema. (Eric, Benoit) > --- > block/Makefile.objs | 1 + > block/null.c | 176 +++++++++++++++++++++++++++++++++++++++++++= ++++++++ > qapi/block-core.json | 20 +++++- > 3 files changed, 195 insertions(+), 2 deletions(-) > create mode 100644 block/null.c >=20 > diff --git a/block/Makefile.objs b/block/Makefile.objs > index 858d2b3..087e281 100644 > --- a/block/Makefile.objs > +++ b/block/Makefile.objs > @@ -9,6 +9,7 @@ block-obj-y +=3D snapshot.o qapi.o > block-obj-$(CONFIG_WIN32) +=3D raw-win32.o win32-aio.o > block-obj-$(CONFIG_POSIX) +=3D raw-posix.o > block-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o > +block-obj-y +=3D null.o > =20 > ifeq ($(CONFIG_POSIX),y) > block-obj-y +=3D nbd.o nbd-client.o sheepdog.o > diff --git a/block/null.c b/block/null.c > new file mode 100644 > index 0000000..5676994 > --- /dev/null > +++ b/block/null.c > @@ -0,0 +1,176 @@ > +/* > + * Null block driver > + * > + * Authors: > + * Fam Zheng > + * > + * Copyright (C) 2014 Red Hat, Inc. > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or = later. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "block/block_int.h" > + > +typedef struct { > + int64_t length; > +} BDRVNullState; > + > +static QemuOptsList runtime_opts =3D { > + .name =3D "null", > + .head =3D QTAILQ_HEAD_INITIALIZER(runtime_opts.head), > + .desc =3D { > + { > + .name =3D "filename", > + .type =3D QEMU_OPT_STRING, > + .help =3D "", > + }, > + { > + .name =3D BLOCK_OPT_SIZE, > + .type =3D QEMU_OPT_SIZE, > + .help =3D "size of the null block", > + }, > + { /* end of list */ } > + }, > +}; > + > +static int null_file_open(BlockDriverState *bs, QDict *options, int fl= ags, > + Error **errp) > +{ > + QemuOpts *opts; > + BDRVNullState *s =3D bs->opaque; > + > + opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); > + qemu_opts_absorb_qdict(opts, options, &error_abort); > + s->length =3D > + qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 1 << 30); > + qemu_opts_del(opts); > + return 0; > +} > + > +static void null_close(BlockDriverState *bs) > +{ > +} > + > +static int64_t null_getlength(BlockDriverState *bs) > +{ > + BDRVNullState *s =3D bs->opaque; > + return s->length; > +} > + > +static coroutine_fn int null_co_read(BlockDriverState *bs, int64_t sec= tor_num, > + uint8_t *buf, int nb_sectors) > +{ > + return 0; > +} > + > +static coroutine_fn int null_co_write(BlockDriverState *bs, int64_t se= ctor_num, > + const uint8_t *buf, int nb_secto= rs) > +{ > + return 0; > +} > + > +static coroutine_fn int null_co_flush(BlockDriverState *bs) > +{ > + return 0; > +} > + > +typedef struct { > + BlockDriverAIOCB common; > + QEMUBH *bh; > +} NullAIOCB; > + > +static void null_aio_cancel(BlockDriverAIOCB *blockacb); > + > +static const AIOCBInfo null_aiocb_info =3D { > + .aiocb_size =3D sizeof(NullAIOCB), > + .cancel =3D null_aio_cancel, > +}; > + > +static void null_bh_cb(void *opaque) > +{ > + NullAIOCB *acb =3D opaque; > + acb->common.cb(acb->common.opaque, 0); > + qemu_bh_delete(acb->bh); > + qemu_aio_release(acb); > +} > + > +static inline BlockDriverAIOCB *null_aio_common(BlockDriverState *bs, > + BlockDriverCompletionF= unc *cb, > + void *opaque) > +{ > + NullAIOCB *acb; > + > + acb =3D qemu_aio_get(&null_aiocb_info, bs, cb, opaque); > + acb->bh =3D aio_bh_new(bdrv_get_aio_context(bs), null_bh_cb, acb); > + qemu_bh_schedule(acb->bh); > + return &acb->common; > +} > + > +static BlockDriverAIOCB *null_aio_readv(BlockDriverState *bs, > + int64_t sector_num, QEMUIOVect= or *qiov, > + int nb_sectors, > + BlockDriverCompletionFunc *cb, > + void *opaque) > +{ > + return null_aio_common(bs, cb, opaque); > +} > + > +static BlockDriverAIOCB *null_aio_writev(BlockDriverState *bs, > + int64_t sector_num, QEMUIOVec= tor *qiov, > + int nb_sectors, > + BlockDriverCompletionFunc *cb= , > + void *opaque) > +{ > + return null_aio_common(bs, cb, opaque); > +} > + > +static BlockDriverAIOCB *null_aio_flush(BlockDriverState *bs, > + BlockDriverCompletionFunc *cb, > + void *opaque) > +{ > + return null_aio_common(bs, cb, opaque); > +} > + > +static void null_aio_cancel(BlockDriverAIOCB *blockacb) > +{ > + NullAIOCB *acb =3D container_of(blockacb, NullAIOCB, common); > + qemu_bh_delete(acb->bh); > + qemu_aio_release(acb); > +} > + > +static BlockDriver bdrv_null =3D { > + .format_name =3D "null", > + .protocol_name =3D "null", > + .instance_size =3D sizeof(BDRVNullState), > + > + .bdrv_file_open =3D null_file_open, > + .bdrv_close =3D null_close, > + .bdrv_getlength =3D null_getlength, > + > + .bdrv_aio_readv =3D null_aio_readv, > + .bdrv_aio_writev =3D null_aio_writev, > + .bdrv_aio_flush =3D null_aio_flush, > +}; > + > +static BlockDriver bdrv_null_co =3D { > + .format_name =3D "null-co", > + .protocol_name =3D "null-co", > + .instance_size =3D sizeof(BDRVNullState), > + > + .bdrv_file_open =3D null_file_open, > + .bdrv_close =3D null_close, > + .bdrv_getlength =3D null_getlength, > + > + .bdrv_read =3D null_co_read, > + .bdrv_write =3D null_co_write, > + .bdrv_co_flush_to_disk =3D null_co_flush, > +}; > + > +static void bdrv_null_init(void) > +{ > + bdrv_register(&bdrv_null); > + bdrv_register(&bdrv_null_co); > +} > + > +block_init(bdrv_null_init); > diff --git a/qapi/block-core.json b/qapi/block-core.json > index fb74c56..92e294c 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -1150,7 +1150,8 @@ > 'data': [ 'archipelago', 'file', 'host_device', 'host_cdrom', 'host_= floppy', > 'http', 'https', 'ftp', 'ftps', 'tftp', 'vvfat', 'blkdebug= ', > 'blkverify', 'bochs', 'cloop', 'cow', 'dmg', 'parallels', = 'qcow', > - 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quor= um' ] } > + 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quor= um', > + 'null', 'null-co' ] } > =20 > ## > # @BlockdevOptionsBase > @@ -1203,6 +1204,19 @@ > 'data': { 'filename': 'str' } } > =20 > ## > +# @BlockdevOptionsNull > +# > +# Driver specific block device options for the null backend. > +# > +# @size: #optional size of the device in bytes. > +# > +# Since: 2.2 > +## > +{ 'type': 'BlockdevOptionsNull', > + 'base': 'BlockdevOptionsFile', > + 'data': { '*size': 'int' } } > + > +## > # @BlockdevOptionsVVFAT > # > # Driver specific block device options for the vvfat protocol. > @@ -1484,7 +1498,9 @@ > 'vhdx': 'BlockdevOptionsGenericFormat', > 'vmdk': 'BlockdevOptionsGenericCOWFormat', > 'vpc': 'BlockdevOptionsGenericFormat', > - 'quorum': 'BlockdevOptionsQuorum' > + 'quorum': 'BlockdevOptionsQuorum', > + 'null': 'BlockdevOptionsNull', > + 'null-co': 'BlockdevOptionsNull' > } } > =20 > ## > --=20 > 2.1.0 >=20 Look good. Reviewed-by: Beno=EEt Canet