From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=54351 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q6KBx-000322-UD
	for qemu-devel@nongnu.org; Sun, 03 Apr 2011 06:06:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <blauwirbel@gmail.com>) id 1Q6KBs-0002NH-UO
	for qemu-devel@nongnu.org; Sun, 03 Apr 2011 06:05:57 -0400
Received: from mail-vw0-f45.google.com ([209.85.212.45]:38957)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <blauwirbel@gmail.com>) id 1Q6KBs-0002ND-QC
	for qemu-devel@nongnu.org; Sun, 03 Apr 2011 06:05:52 -0400
Received: by vws17 with SMTP id 17so4127394vws.4
	for <qemu-devel@nongnu.org>; Sun, 03 Apr 2011 03:05:52 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <4D9840D7.1070209@mail.berlios.de>
References: <1301605129-12808-1-git-send-email-weil@mail.berlios.de>
	<BANLkTincWPdM2kqdjKevSXnVP1EXACKAjw@mail.gmail.com>
	<4D9840D7.1070209@mail.berlios.de>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 3 Apr 2011 13:05:32 +0300
Message-ID: <BANLkTikF6Vd0Kvb0nG1J2WNwjv=z5DV9EQ@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: [Qemu-devel] Re: [PATCH] w32: Fix compilation of new code
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Weil <weil@mail.berlios.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>, QEMU Developers <qemu-devel@nongnu.org>

On Sun, Apr 3, 2011 at 12:41 PM, Stefan Weil <weil@mail.berlios.de> wrote:
> Am 03.04.2011 11:10, schrieb Blue Swirl:
>>
>> On Thu, Mar 31, 2011 at 11:58 PM, Stefan Weil <weil@mail.berlios.de>
>> wrote:
>>>
>>> Some recently added new code did not compile for w32 targets.
>>>
>>> The functions qemu_iohandler_fill and qemu_iohandler_poll need
>>> data type fd_set which is declared in winsock2.h for w32 targets.
>>>
>>> Moving the functions from qemu-common.h to qemu_socket.h fixes
>>> compilations for w32 without adding a new include file to qemu-common.h.
>>
>> There's nothing socket specific in qemu_iohandler_fill and
>> qemu_iohandler_poll, so I'd rather fix qemu-common.h. But I have a
>> patch in my working queue to move OS specific stuff to qemu-common.h,
>> I'll fix this there.
>
>
> Adding a new file iohandler.h for these functions would also solve the
> problem.
> Or maybe there is an include file which is better suited than qemu_socket.h.
>
> I think that functions which are only used in one file and declared
> in another file should not be in qemu-common.h. In this special case,
> all code which uses qemu-common.h would also require winsock2.h
> just because of fd_set!

There are a lot of include directives already in qemu-common.h. I see
qemu-common.h as a library of useful stuff that may be used anywhere
in QEMU. The opposite approach is to sprinkle all .c files with
specific set of include directives for just that file.

> By the way: there is one file qemu_*.h, and there are 25 files qemu-*.h.
> What about renaming qemu_socket.h to qemu-socket.h?

There are a lot of files in both conventions.