From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33278)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1V8vfQ-0005x6-Qd
	for qemu-devel@nongnu.org; Mon, 12 Aug 2013 13:12:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1V8vfJ-0007iM-HA
	for qemu-devel@nongnu.org; Mon, 12 Aug 2013 13:12:28 -0400
Received: from david.siemens.de ([192.35.17.14]:23132)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1V8vfJ-0007iB-7g
	for qemu-devel@nongnu.org; Mon, 12 Aug 2013 13:12:21 -0400
Message-ID: <5209176C.3080508@siemens.com>
Date: Mon, 12 Aug 2013 19:12:12 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <1376239405-4084-1-git-send-email-alex@alex.org.uk>
	<1376239405-4084-10-git-send-email-alex@alex.org.uk>
	<52090FE1.4040800@siemens.com>
	<FE42D1EA-7444-4903-9C84-7BAC01AE45C7@alex.org.uk>
In-Reply-To: <FE42D1EA-7444-4903-9C84-7BAC01AE45C7@alex.org.uk>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [RFC] [PATCHv10 09/31] aio / timers: Untangle
 include files
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alex Bligh <alex@alex.org.uk>
Cc: Kevin Wolf <kwolf@redhat.com>, Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, liu ping fan <qemulist@gmail.com>, Stefan Hajnoczi <stefanha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>, rth@twiddle.net

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