From patchwork Mon Feb 24 14:52:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 25203 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A7C3E2066C for ; Mon, 24 Feb 2014 14:55:53 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id j5sf9335689qaq.10 for ; Mon, 24 Feb 2014 06:55:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=zQ4SnGjCosJSDo2HfovKAtTvLClIS90sWGZ/LlKtRKg=; b=e+q+dbMHw3zzsYNnS/kYG7dd9aaAowkYPoPCMc7zuMU9tB72JIFH60RpbQXiO4kF7B mlYVTG/8u2jeaTEU4M8FLzj4h96x5dQHI8HJvpzGUuRBQISIKXtp9LvINwU3Sym2lHj4 4MTku+dPD/GkENBolaA7m3mJUuvVvipl1P92yxa2e9/wbdKMfDcad+STxec+vXxXOz/G ZHM+hzxSgYi5I/T47f9OIgIulPXgRrkIXmJzmyRXqguIVFUU5QXS2BBa5U4TZ4SPGWPz lLr0CyqXKwe9zDcb7htvNlR2Jv9LtsNPaMzjTmFlW8eFb8bJGcWHRosrMHKJVjitVqsa KBGA== X-Gm-Message-State: ALoCoQlDGIe0JdsIGyxicGER665YXvPBB4KQ5Z+RpXSrGz1jGnxNSev/zigF9o/N1A9NKc76FwPt X-Received: by 10.236.144.102 with SMTP id m66mr7013875yhj.50.1393253753495; Mon, 24 Feb 2014 06:55:53 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.51 with SMTP id o48ls1903211qgd.83.gmail; Mon, 24 Feb 2014 06:55:53 -0800 (PST) X-Received: by 10.52.164.39 with SMTP id yn7mr10710575vdb.25.1393253753353; Mon, 24 Feb 2014 06:55:53 -0800 (PST) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id p9si5882181vdv.31.2014.02.24.06.55.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 06:55:53 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id lh14so5783595vcb.24 for ; Mon, 24 Feb 2014 06:55:53 -0800 (PST) X-Received: by 10.220.67.18 with SMTP id p18mr12888903vci.14.1393253753276; Mon, 24 Feb 2014 06:55:53 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp66862vcz; Mon, 24 Feb 2014 06:55:53 -0800 (PST) X-Received: by 10.52.168.39 with SMTP id zt7mr10752370vdb.42.1393253752945; Mon, 24 Feb 2014 06:55:52 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id f7si5899709vch.24.2014.02.24.06.55.52 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 24 Feb 2014 06:55:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHwvB-0006ea-6Y; Mon, 24 Feb 2014 14:54:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHwv8-0006dk-Vd for xen-devel@lists.xenproject.org; Mon, 24 Feb 2014 14:54:15 +0000 Received: from [193.109.254.147:43771] by server-7.bemta-14.messagelabs.com id 62/0F-23424-61D5B035; Mon, 24 Feb 2014 14:54:14 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1393253653!6438015!1 X-Originating-IP: [74.125.83.47] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30976 invoked from network); 24 Feb 2014 14:54:13 -0000 Received: from mail-ee0-f47.google.com (HELO mail-ee0-f47.google.com) (74.125.83.47) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 24 Feb 2014 14:54:13 -0000 Received: by mail-ee0-f47.google.com with SMTP id e49so1017551eek.20 for ; Mon, 24 Feb 2014 06:53:14 -0800 (PST) X-Received: by 10.15.34.71 with SMTP id d47mr693936eev.107.1393253594010; Mon, 24 Feb 2014 06:53:14 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id x6sm64689130eew.20.2014.02.24.06.53.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Feb 2014 06:53:13 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 24 Feb 2014 14:52:51 +0000 Message-Id: <1393253572-7157-6-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1393253572-7157-1-git-send-email-julien.grall@linaro.org> References: <1393253572-7157-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Keir Fraser , Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v2 5/6] xen/console: Add noreturn attribute to panic function X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Panic function will never return. Without this attribute, gcc may output warnings in call function. Cc: Keir Fraser Signed-off-by: Julien Grall --- xen/drivers/char/console.c | 4 +++- xen/include/xen/lib.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index cdf23f1..f17848b 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1042,7 +1042,7 @@ __initcall(debugtrace_init); * ************************************************************** */ -void panic(const char *fmt, ...) +void __attribute__((noreturn)) panic(const char *fmt, ...) { va_list args; unsigned long flags; @@ -1085,6 +1085,8 @@ void panic(const char *fmt, ...) watchdog_disable(); machine_restart(5000); } + + while ( 1 ); } void __bug(char *file, int line) diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 5b258fd..9c3a242 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -88,7 +88,7 @@ extern void printk(const char *format, ...) extern void guest_printk(const struct domain *d, const char *format, ...) __attribute__ ((format (printf, 2, 3))); extern void panic(const char *format, ...) - __attribute__ ((format (printf, 1, 2))); + __attribute__ ((format (printf, 1, 2))) __attribute__ ((noreturn)); extern long vm_assist(struct domain *, unsigned int, unsigned int); extern int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst); extern int printk_ratelimit(void);