From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41677 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhHHj-0005Ne-8I for qemu-devel@nongnu.org; Mon, 24 Jan 2011 02:56:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PhHHh-0004Lq-IH for qemu-devel@nongnu.org; Mon, 24 Jan 2011 02:56:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PhHHh-0004Ky-BZ for qemu-devel@nongnu.org; Mon, 24 Jan 2011 02:56:21 -0500 Message-ID: <4D3D3097.5060508@redhat.com> Date: Mon, 24 Jan 2011 08:56:07 +0100 From: Jes Sorensen MIME-Version: 1.0 References: <1295270117-24760-1-git-send-email-mdroth@linux.vnet.ibm.com> <1295270117-24760-4-git-send-email-mdroth@linux.vnet.ibm.com> <4D39B4B0.50207@redhat.com> <4D39C1D4.9030805@linux.vnet.ibm.com> In-Reply-To: <4D39C1D4.9030805@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [RFC][PATCH v6 03/23] Make qemu timers available for tools List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, abeekhof@redhat.com, marcel.mittelstaedt@de.ibm.com, qemu-devel@nongnu.org, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, markus_mueller@de.ibm.com On 01/21/11 18:26, Michael Roth wrote: > On 01/21/2011 10:30 AM, Jes Sorensen wrote: >> On 01/17/11 14:14, Michael Roth wrote: >>> diff --git a/qemu-ioh.c b/qemu-ioh.c >>> index cc71470..001e7a2 100644 >>> --- a/qemu-ioh.c >>> +++ b/qemu-ioh.c >>> @@ -22,7 +22,11 @@ >>> * THE SOFTWARE. >>> */ >>> #include "qemu-ioh.h" >>> +#include "qemu-char.h" >>> #include "qlist.h" >>> +#ifdef CONFIG_EVENTFD >>> +#include >>> +#endif >>> >>> /* XXX: fd_read_poll should be suppressed, but an API change is >>> necessary in the character devices to suppress fd_can_read(). */ >>> @@ -113,3 +117,92 @@ void qemu_process_fd_handlers2(void >>> *ioh_record_list, const fd_set *rfds, >>> } >>> } >>> } >>> + >>> +#ifndef _WIN32 >>> +void iothread_event_increment(int *io_thread_fd) >> >> Please split the WIN32 stuff into it's own file, similar to oslib-posix >> and oslib-win32.c etc. > > Will look into this, but qemu-ioh.c has common code too so we'd end up > with qemu-ioh/qemu-ioh-posix/qemu-ioh-win2.c. We could alternatively > have a "#ifndef _WIN32" around functions in qemu-ioh.c that would be > replaced by win32-specific ones from qemu-ioh-win32. No strong > preference either way, but sometimes I find navigating across too many > files more annoying that #ifdefs, and there's not a whole lot in these. No problem having the three files - it is far better than having #ifdefs. Having the #ifndef that is overloaded by a win32 specific file is bad, it will make it very confusing for anyone reading the code. Cheers, Jes