From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH v3 2/4] xen/xsm: Add xsm_core_init function Date: Fri, 21 Mar 2014 14:02:05 +0000 Message-ID: <532C465D.4060106@linaro.org> References: <1395407109-19153-1-git-send-email-julien.grall@linaro.org> <1395407109-19153-3-git-send-email-julien.grall@linaro.org> <532C4F380200007800126978@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WR01R-0005i9-0b for xen-devel@lists.xenproject.org; Fri, 21 Mar 2014 14:02:09 +0000 Received: by mail-wg0-f41.google.com with SMTP id n12so1671395wgh.24 for ; Fri, 21 Mar 2014 07:02:07 -0700 (PDT) In-Reply-To: <532C4F380200007800126978@nat28.tlf.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: xen-devel@lists.xenproject.org, Daniel De Graaf , stefano.stabellini@citrix.com, ian.campbell@citrix.com, tim@xen.org List-Id: xen-devel@lists.xenproject.org Hi Jan, On 03/21/2014 01:39 PM, Jan Beulich wrote: >>>> On 21.03.14 at 14:05, Julien Grall wrote: >> --- a/xen/xsm/xsm_core.c >> +++ b/xen/xsm/xsm_core.c >> @@ -43,6 +43,21 @@ static void __init do_xsm_initcalls(void) >> } >> } >> >> +static int __init xsm_core_init(void) >> +{ >> + if ( verify(&dummy_xsm_ops) ) >> + { >> + printk("%s could not verify " >> + "dummy_xsm_ops structure.\n", __FUNCTION__); >> + return -EIO; >> + } >> + >> + xsm_ops = &dummy_xsm_ops; >> + do_xsm_initcalls(); >> + >> + return 0; >> +} >> + >> #ifdef CONFIG_MULTIBOOT >> int __init xsm_multiboot_init(unsigned long *module_map, >> const multiboot_info_t *mbi, >> @@ -63,16 +78,7 @@ int __init xsm_multiboot_init(unsigned long *module_map, >> } >> } >> >> - if ( verify(&dummy_xsm_ops) ) >> - { >> - bootstrap_map(NULL); > > So where did that call go? After xsm_core_init (see below). >> - printk("%s could not verify " >> - "dummy_xsm_ops structure.\n", __FUNCTION__); >> - return -EIO; >> - } >> - >> - xsm_ops = &dummy_xsm_ops; >> - do_xsm_initcalls(); >> + ret = xsm_core_init(); >> bootstrap_map(NULL); Just here. Regards, -- Julien Grall