On 12/10/2015 11:55, Fam Zheng wrote: > Signed-off-by: Fam Zheng <f...@redhat.com> > --- > Makefile.objs | 1 + > aio-epoll.c | 150 > +++++++++++++++++++++++++++++++++++++++++++ > aio-posix.c | 16 ++++- > include/block/aio-internal.h | 15 +++++ > include/block/aio.h | 5 ++ > stubs/Makefile.objs | 1 + > stubs/aio-epoll.c | 37 +++++++++++ > 7 files changed, 223 insertions(+), 2 deletions(-) > create mode 100644 aio-epoll.c > create mode 100644 stubs/aio-epoll.c
aio-epoll.c seems small enough that you can just include everything in aio-posix.c. This should simplify everything and make patch 1 unnecessary, too. Paolo