From 41574268b7e61ab98384ca7048f3fec862433401 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 19 May 2016 17:05:50 -0600 Subject: block: Move BlockRequest type to io.c I was thrown by the fact that the public type BlockRequest had an anonymous union, but no obvious discriminator. Turns out that the only client of the second branch of the union was code internal to io.c, now that commit 91c6e4b killed public multiwrite, so move it into io.c and improve the comments. Signed-off-by: Eric Blake Message-Id: <1463699150-19445-1-git-send-email-eblake@redhat.com> Signed-off-by: Fam Zheng --- include/block/block.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'include/block/block.h') diff --git a/include/block/block.h b/include/block/block.h index d6bb74d77e..3fd5043d01 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -320,27 +320,6 @@ BlockAIOCB *bdrv_aio_discard(BlockDriverState *bs, void bdrv_aio_cancel(BlockAIOCB *acb); void bdrv_aio_cancel_async(BlockAIOCB *acb); -typedef struct BlockRequest { - /* Fields to be filled by caller */ - union { - struct { - int64_t sector; - int nb_sectors; - int flags; - QEMUIOVector *qiov; - }; - struct { - int req; - void *buf; - }; - }; - BlockCompletionFunc *cb; - void *opaque; - - /* Filled by block layer */ - int error; -} BlockRequest; - /* sg packet commands */ int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf); BlockAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, -- cgit v1.2.3