From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Jan Beulich" <JBeulich@suse.com>
Subject: Re: [PATCH v3 2/4] xen/xsm: Add xsm_core_init function
Date: Fri, 21 Mar 2014 13:39:52 +0000
Message-ID: <532C4F380200007800126978@nat28.tlf.novell.com>
References: <1395407109-19153-1-git-send-email-julien.grall@linaro.org>
	<1395407109-19153-3-git-send-email-julien.grall@linaro.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <JBeulich@suse.com>) id 1WQzfv-00034c-LY
	for xen-devel@lists.xenproject.org; Fri, 21 Mar 2014 13:39:55 +0000
In-Reply-To: <1395407109-19153-3-git-send-email-julien.grall@linaro.org>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Julien Grall <julien.grall@linaro.org>
Cc: xen-devel@lists.xenproject.org, Daniel De Graaf <dgdegra@tycho.nsa.gov>, stefano.stabellini@citrix.com, ian.campbell@citrix.com, tim@xen.org
List-Id: xen-devel@lists.xenproject.org

>>> On 21.03.14 at 14:05, Julien Grall <julien.grall@linaro.org> 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?

Jan

> -        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);
>  
>      return 0;