On 2013-08-12 19:04, Alex Bligh wrote: > Jan, > > On 12 Aug 2013, at 17:40, Jan Kiszka wrote: > >> On 2013-08-11 18:43, Alex Bligh wrote: >>> include/qemu/timer.h has no need to include main-loop.h and >>> doing so causes an issue for the next patch. Unfortunately >>> various files assume including timers.h will pull in main-loop.h. >>> Untangle this mess. >>> >> >> Hmm, this triggers a double typedef of AioContext for me. I've resolved >> it like the QEMUTimer issue: moved the typedef to typedefs.h. > > For clarity, you mean in include/block/aio.h: > typedef struct AioContext { > becomes > include/block/aio.h:struct AioContext { > > and then in include/qemu/typedefs.h add: > typedef struct AioContext AioContext;
Yes, and remove the typedef from coroutine.h (that's the duplication). > > (just so I can get it right in v11 as I don't see your error here) > This can be an independent patch, in fact. You don't introduce the issue, just expose it this way. Jan -- Siemens AG, Corporate Technology, CT RTC ITP SES-DE Corporate Competence Center Embedded Linux