Fam Zheng <f...@redhat.com> writes:
> On Fri, 11/06 18:07, Peter Maydell wrote:
>> On 6 November 2015 at 17:52, Stefan Hajnoczi <stefa...@redhat.com> wrote:
>> > The following changes since commit
>> > 4b59f39bc9a03afcc74b2fa28da7c3189fca507c:
>> >
>> > Merge remote-tracking branch
>> > 'remotes/mjt/tags/pull-trivial-patches-2015-11-06' into staging
>> > (2015-11-06 12:50:24 +0000)
>> >
>> > are available in the git repository at:
>> >
>> > git://github.com/stefanha/qemu.git tags/block-pull-request
>> >
>> > for you to fetch changes up to 6f707181b1bd6ccf2d2fd9397039c7ef6fa4a9fd:
>> >
>> > blockdev: acquire AioContext in hmp_commit() (2015-11-06 15:41:00 +0000)
>> >
>> > ----------------------------------------------------------------
>>
>> Build failure on OSX :-(
>>
>> /Users/pm215/src/qemu-for-merges/aio-posix.c CC block/qcow.o
>> :442:37: error: no member named 'epollfd' in 'struct AioContext'
>> epoll_handler.pfd.fd = ctx->epollfd;
>> ~~~ ^
>>
>
> :(
>
> I think it is harmless to always include this member in AioContext. Stefan,
> could you squash this into patch 5? Thanks!
>
> Fam
>
> ---
>
> diff --git a/include/block/aio.h b/include/block/aio.h
> index 91737d5..735f1f8 100644
> --- a/include/block/aio.h
> +++ b/include/block/aio.h
> @@ -124,11 +124,9 @@ struct AioContext {
> QEMUTimerListGroup tlg;
>
> int external_disable_cnt;
> -#ifdef CONFIG_EPOLL
> int epollfd;
> bool epoll_enabled;
> bool epoll_available;
> -#endif
> };
Replace by the ifdeffery by a comment pointing to CONFIG_EPOLL, perhaps?
