From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH] xen/arm: Panic if platform initialization failed Date: Fri, 15 Nov 2013 15:27:36 +0000 Message-ID: <1384529257-7590-2-git-send-email-julien.grall@linaro.org> References: <1384529257-7590-1-git-send-email-julien.grall@linaro.org> 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 1VhLJT-00031e-1e for xen-devel@lists.xenproject.org; Fri, 15 Nov 2013 15:28:03 +0000 Received: by mail-we0-f180.google.com with SMTP id u57so3168152wes.39 for ; Fri, 15 Nov 2013 07:28:01 -0800 (PST) In-Reply-To: <1384529257-7590-1-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: stefano.stabellini@eu.citrix.com, tim@xen.org, ian.campbell@citrix.com, Julien Grall , patches@linaro.org List-Id: xen-devel@lists.xenproject.org Actually, if an error occurs, Xen will silently ignore it and continue. Convert platform_init to a void function and panic if we fail to correctly initialize the platform. Signed-off-by: Julien Grall --- xen/arch/arm/platform.c | 5 +++-- xen/include/asm-arm/platform.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index db135f8..0fbbdc7 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -54,7 +54,7 @@ static void dump_platform_table(void) printk(" - %s\n", p->name); } -int __init platform_init(void) +void __init platform_init(void) { int res = 0; @@ -82,7 +82,8 @@ int __init platform_init(void) if ( platform && platform->init ) res = platform->init(); - return res; + if ( res ) + panic("Unable to initialize the platform\n"); } int __init platform_init_time(void) diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 43afebb..c282b30 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -45,7 +45,7 @@ struct platform_desc { */ #define PLATFORM_QUIRK_DOM0_MAPPING_11 (1 << 0) -int __init platform_init(void); +void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(struct domain *d); #ifdef CONFIG_ARM_32 -- 1.8.3.1