From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kt0v7-0003KZ-AJ for qemu-devel@nongnu.org; Thu, 23 Oct 2008 10:12:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kt0v6-0003K9-Qm for qemu-devel@nongnu.org; Thu, 23 Oct 2008 10:12:13 -0400 Received: from [199.232.76.173] (port=46442 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kt0v6-0003Ju-Kx for qemu-devel@nongnu.org; Thu, 23 Oct 2008 10:12:12 -0400 Received: from mx2.redhat.com ([66.187.237.31]:59749) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kt0v3-0006ip-Qb for qemu-devel@nongnu.org; Thu, 23 Oct 2008 10:12:10 -0400 Date: Thu, 23 Oct 2008 12:13:31 -0200 From: Glauber Costa Message-ID: <20081023141331.GD18872@poweredge.glommer> References: <1224771556-11146-1-git-send-email-glommer@redhat.com> <1224771556-11146-4-git-send-email-glommer@redhat.com> <490081B4.9080008@us.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <490081B4.9080008@us.ibm.com> Subject: [Qemu-devel] Re: [PATCH 03/32] change definition of FILE for linux Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: jan.kiszka@siemens.com, jes@sgi.com, qemu-devel@nongnu.org, avi@qumranet.com, dmitry.baryshkov@siemens.com On Thu, Oct 23, 2008 at 08:52:52AM -0500, Anthony Liguori wrote: > Glauber Costa wrote: >> use _IO_FILE, as it seems to be the case. >> > > Why? What is this fixing? > > It seems to work fine today and I don't see how this is related to the > series. It's not possible to include exec.h into kqemu.c without it, because it conflicts with virtually everything from stdio.h The inclusion of exec.h is necessary for the cpu_exec patch, since we'll be using symbols defined in that header. OTOH, those symbols are mostly macros that cast env->something, and if really needed, I can use the env-> versions instead. > > Regards, > > Anthony Liguori > >> Signed-off-by: Glauber Costa >> --- >> dyngen-exec.h | 6 ++++++ >> 1 files changed, 6 insertions(+), 0 deletions(-) >> >> diff --git a/dyngen-exec.h b/dyngen-exec.h >> index 9260b6f..826ff46 100644 >> --- a/dyngen-exec.h >> +++ b/dyngen-exec.h >> @@ -27,6 +27,10 @@ >> #define _FILEDEFED >> #endif >> >> +#ifdef __linux__ >> +#define __FILE_defined >> +#endif >> + >> /* NOTE: standard headers should be used with special care at this >> point because host CPU registers are used as global variables. Some >> host headers do not allow that. */ >> @@ -84,6 +88,8 @@ typedef void * host_reg_t; >> >> #ifdef _BSD >> typedef struct __sFILE FILE; >> +#elif defined(__linux__) >> +typedef struct _IO_FILE FILE; >> #else >> typedef struct FILE FILE; >> #endif >> >