From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wswn2-0004XO-H7 for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wswmx-0004Ri-1F for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:14:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wswmw-0004RW-QB for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:14:42 -0400 From: Stefan Hajnoczi Date: Fri, 6 Jun 2014 18:13:35 +0200 Message-Id: <1402071243-16702-15-git-send-email-stefanha@redhat.com> In-Reply-To: <1402071243-16702-1-git-send-email-stefanha@redhat.com> References: <1402071243-16702-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 14/42] quorum: implement .bdrv_detach/attach_aio_context() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi Implement .bdrv_detach/attach_aio_context() interfaces to propagate detach/attach to BDRVQuorumState->bs[] children. The block layer takes care of ->file and ->backing_hd but doesn't know about our ->bs[] BlockDriverStates, which is also part of the graph. Reviewed-by: Beno=C3=AEt Canet Signed-off-by: Stefan Hajnoczi --- block/quorum.c | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index ecec3a5..426077a 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -848,25 +848,49 @@ static void quorum_close(BlockDriverState *bs) g_free(s->bs); } =20 +static void quorum_detach_aio_context(BlockDriverState *bs) +{ + BDRVQuorumState *s =3D bs->opaque; + int i; + + for (i =3D 0; i < s->num_children; i++) { + bdrv_detach_aio_context(s->bs[i]); + } +} + +static void quorum_attach_aio_context(BlockDriverState *bs, + AioContext *new_context) +{ + BDRVQuorumState *s =3D bs->opaque; + int i; + + for (i =3D 0; i < s->num_children; i++) { + bdrv_attach_aio_context(s->bs[i], new_context); + } +} + static BlockDriver bdrv_quorum =3D { - .format_name =3D "quorum", - .protocol_name =3D "quorum", + .format_name =3D "quorum", + .protocol_name =3D "quorum", + + .instance_size =3D sizeof(BDRVQuorumState), =20 - .instance_size =3D sizeof(BDRVQuorumState), + .bdrv_file_open =3D quorum_open, + .bdrv_close =3D quorum_close, =20 - .bdrv_file_open =3D quorum_open, - .bdrv_close =3D quorum_close, + .bdrv_co_flush_to_disk =3D quorum_co_flush, =20 - .bdrv_co_flush_to_disk =3D quorum_co_flush, + .bdrv_getlength =3D quorum_getlength, =20 - .bdrv_getlength =3D quorum_getlength, + .bdrv_aio_readv =3D quorum_aio_readv, + .bdrv_aio_writev =3D quorum_aio_writev, + .bdrv_invalidate_cache =3D quorum_invalidate_cache, =20 - .bdrv_aio_readv =3D quorum_aio_readv, - .bdrv_aio_writev =3D quorum_aio_writev, - .bdrv_invalidate_cache =3D quorum_invalidate_cache, + .bdrv_detach_aio_context =3D quorum_detach_aio_context, + .bdrv_attach_aio_context =3D quorum_attach_aio_context, =20 - .is_filter =3D true, - .bdrv_recurse_is_first_non_filter =3D quorum_recurse_is_first_non_fi= lter, + .is_filter =3D true, + .bdrv_recurse_is_first_non_filter =3D quorum_recurse_is_first_non_= filter, }; =20 static void bdrv_quorum_init(void) --=20 1.9.3