From: Jeremy Fitzhardinge Subject: Re: [Xen-devel] [PATCH 4/7] xen: The entrance for PV extension of HVM Date: Mon, 01 Mar 2010 17:05:36 -0800 Message-ID: <4B8C6460.6020506@goop.org> References: <1267436315-24486-1-git-send-email-sheng@linux.intel.com> <1267436315-24486-5-git-send-email-sheng@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1267436315-24486-5-git-send-email-sheng@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: Sheng Yang Cc: Keir Fraser , Jeremy Fitzhardinge , Ian Pratt , xen-devel , Ian Campbell , Stefano Stabellini , linux-kernel@vger.kernel.org, Ingo Molnar List-Id: xen-devel@lists.xenproject.org On 03/01/2010 01:38 AM, Sheng Yang wrote: > xen_guest_init() would setup the environment. > > Cc: Ingo Molnar > Signed-off-by: Sheng Yang > --- > arch/x86/kernel/setup.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index 5d9e40c..2b61d46 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -113,6 +113,10 @@ > #endif > #include > > +#ifdef CONFIG_XEN > +#include > +#endif > No #ifdefs; put them in xen.h if necessary (which they aren't). This probably isn't the right header anyway; this is specifically for testing the presence of Xen and/or the current domain type. It shouldn't have any other prototypes in it, or include anything else (it probably already includes too much). Given this is already x86-specific code, include asm/xen/something.h. > + > /* > * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. > * The direct mapping extends to max_pfn_mapped, so that we can directly access > @@ -740,6 +744,10 @@ void __init setup_arch(char **cmdline_p) > > x86_init.oem.arch_setup(); > > +#ifdef CONFIG_XEN > + xen_guest_init(); > +#endif > Again, no #ifdefs here. Put an #ifdeffed stub in an appropriate header. J