ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io_uring: move LuringState typedef to block/aio.h 

The LuringState typedef is defined twice, in include/block/raw-aio.h and
block/io_uring.c.  Move it in include/block/aio.h, which is included
everywhere the typedef is needed, since include/block/aio.h already has
to define the forward reference to the struct.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-07-12 15:10:10 +02:00
parent aef158b093
commit 3cbc17ee92
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/io_uring.c
View File

@ -49,7 +49,7 @@ typedef struct LuringQueue {
QSIMPLEQ_HEAD(, LuringAIOCB) submit_queue; QSIMPLEQ_HEAD(, LuringAIOCB) submit_queue;
} LuringQueue; } LuringQueue;
typedef struct LuringState { struct LuringState {
AioContext *aio_context; AioContext *aio_context;
struct io_uring ring; struct io_uring ring;
@ -58,7 +58,7 @@ typedef struct LuringState {
LuringQueue io_q; LuringQueue io_q;
QEMUBH *completion_bh; QEMUBH *completion_bh;
} LuringState; };
/** /**
* luring_resubmit: * luring_resubmit:

8
include/block/aio.h
View File

@ -55,7 +55,7 @@ typedef void IOHandler(void *opaque);
struct ThreadPool; struct ThreadPool;
struct LinuxAioState; struct LinuxAioState;
struct LuringState; typedef struct LuringState LuringState;
/* Is polling disabled? */ /* Is polling disabled? */
bool aio_poll_disabled(AioContext *ctx); bool aio_poll_disabled(AioContext *ctx);
@ -212,7 +212,7 @@ struct AioContext {
struct LinuxAioState *linux_aio; struct LinuxAioState *linux_aio;
#endif #endif
#ifdef CONFIG_LINUX_IO_URING #ifdef CONFIG_LINUX_IO_URING
struct LuringState *linux_io_uring; LuringState *linux_io_uring;
/* State for file descriptor monitoring using Linux io_uring */ /* State for file descriptor monitoring using Linux io_uring */
struct io_uring fdmon_io_uring; struct io_uring fdmon_io_uring;
@ -504,10 +504,10 @@ struct LinuxAioState *aio_setup_linux_aio(AioContext *ctx, Error **errp);
struct LinuxAioState *aio_get_linux_aio(AioContext *ctx); struct LinuxAioState *aio_get_linux_aio(AioContext *ctx);
/* Setup the LuringState bound to this AioContext */ /* Setup the LuringState bound to this AioContext */
struct LuringState *aio_setup_linux_io_uring(AioContext *ctx, Error **errp); LuringState *aio_setup_linux_io_uring(AioContext *ctx, Error **errp);
/* Return the LuringState bound to this AioContext */ /* Return the LuringState bound to this AioContext */
struct LuringState *aio_get_linux_io_uring(AioContext *ctx); LuringState *aio_get_linux_io_uring(AioContext *ctx);
/** /**
* aio_timer_new_with_attrs: * aio_timer_new_with_attrs:
* @ctx: the aio context * @ctx: the aio context

1
include/block/raw-aio.h
View File

@ -65,7 +65,6 @@ void laio_attach_aio_context(LinuxAioState *s, AioContext *new_context);
#endif #endif
/* io_uring.c - Linux io_uring implementation */ /* io_uring.c - Linux io_uring implementation */
#ifdef CONFIG_LINUX_IO_URING #ifdef CONFIG_LINUX_IO_URING
typedef struct LuringState LuringState;
LuringState *luring_init(Error **errp); LuringState *luring_init(Error **errp);
void luring_cleanup(LuringState *s); void luring_cleanup(LuringState *s);