From patchwork Sat Jun 28 01:25:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 32643 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 64A39200B9 for ; Sat, 28 Jun 2014 01:26:47 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id y10sf21481469pdj.9 for ; Fri, 27 Jun 2014 18:26:46 -0700 (PDT) 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=QmK+hlT5+fk3dnttOX3NsexqRXn7yL7gcLJIEAkTv7w=; b=I7qGwgf2u05akYntcTutwxNQmaPeABFe/uQzsZuLZV524+PsfEQv5yHhaafg3Rnc50 Zq5r2FNrgH00IndeNJosQDzQB/JxBjyY+DIRQ3zI9l7HPY5j/88wjokPFvhyDu9halrG VzwfgDbfd6mWymK9vUErT3bq4q7fQ8nro27tHF1DqzI7WAEQib+nMWaaO5nK4IWqRCcu 5ebXbEHtZs6mIV9qZefZKV07FpiOIXK/lbtnTYWTAFTJ8kw7oHlzQ2rxkXn0kEriPJ1I JC4Ou9I0koRuw8E+D1UsdtKSip8VV/pnhzQt/e2Eb3MYdipjFMtax6gpby0WWJK86zgz ZVKA== X-Gm-Message-State: ALoCoQk+hJyP0dA6wMJ+Ei2PfOqI+G0zshN0avw4F4Tr9YOa/a4lm+PE2yAa8w5Tu5bPE7wO5WF8 X-Received: by 10.66.65.142 with SMTP id x14mr14504412pas.14.1403918806571; Fri, 27 Jun 2014 18:26:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.244 with SMTP id z107ls894533qgz.43.gmail; Fri, 27 Jun 2014 18:26:46 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr23145273vcb.0.1403918806459; Fri, 27 Jun 2014 18:26:46 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id 16si7197976vdd.92.2014.06.27.18.26.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Jun 2014 18:26:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id oy12so6064809veb.41 for ; Fri, 27 Jun 2014 18:26:46 -0700 (PDT) X-Received: by 10.52.17.129 with SMTP id o1mr19250231vdd.0.1403918806309; Fri, 27 Jun 2014 18:26:46 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp147815vcb; Fri, 27 Jun 2014 18:26:45 -0700 (PDT) X-Received: by 10.50.1.111 with SMTP id 15mr16630255igl.7.1403918805688; Fri, 27 Jun 2014 18:26:45 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id qo6si898712igb.27.2014.06.27.18.26.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 27 Jun 2014 18:26:45 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1X0hOt-0007FR-7K; Sat, 28 Jun 2014 01:25:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X0hOr-0007Ek-JK for xen-devel@lists.xen.org; Sat, 28 Jun 2014 01:25:53 +0000 Received: from [85.158.143.35:17062] by server-2.bemta-4.messagelabs.com id 95/C9-06539-0A91EA35; Sat, 28 Jun 2014 01:25:52 +0000 X-Env-Sender: roy.franz@linaro.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1403918750!14469049!1 X-Originating-IP: [209.85.192.178] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22110 invoked from network); 28 Jun 2014 01:25:52 -0000 Received: from mail-pd0-f178.google.com (HELO mail-pd0-f178.google.com) (209.85.192.178) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jun 2014 01:25:52 -0000 Received: by mail-pd0-f178.google.com with SMTP id r10so5174669pdi.9 for ; Fri, 27 Jun 2014 18:25:50 -0700 (PDT) X-Received: by 10.66.118.71 with SMTP id kk7mr34325192pab.147.1403918750053; Fri, 27 Jun 2014 18:25:50 -0700 (PDT) Received: from rfranz-t520.local (c-24-10-97-91.hsd1.ca.comcast.net. [24.10.97.91]) by mx.google.com with ESMTPSA id eh4sm16637918pbc.79.2014.06.27.18.25.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jun 2014 18:25:49 -0700 (PDT) From: Roy Franz To: xen-devel@lists.xen.org, ian.campbell@citrix.com, stefano.stabellini@citrix.com, tim@xen.org, jbeulich@suse.com, keir@xen.org Date: Sat, 28 Jun 2014 02:25:21 +0100 Message-Id: <1403918735-30027-6-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403918735-30027-1-git-send-email-roy.franz@linaro.org> References: <1403918735-30027-1-git-send-email-roy.franz@linaro.org> Cc: Roy Franz , fu.wei@linaro.org, linaro-uefi@lists.linaro.org Subject: [Xen-devel] [PATCH RFC 05/19] Add PrintErrMesg function that doesn't exit 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: roy.franz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) 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: Add the PrintErrMesg() function that just prints the error information, but does not exit the program. PrintErrMesgExit() is updated to be composed of a call to PrintErrMesg() and blexit(). Signed-off-by: Roy Franz --- xen/arch/x86/efi/efi-shared.c | 8 +++++++- xen/include/efi/efi-shared.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/efi/efi-shared.c b/xen/arch/x86/efi/efi-shared.c index ad668cb..d997b5c 100644 --- a/xen/arch/x86/efi/efi-shared.c +++ b/xen/arch/x86/efi/efi-shared.c @@ -123,7 +123,7 @@ bool_t __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) /* generic routine for printing error messages */ -void __init PrintErrMesgExit(const CHAR16 *mesg, EFI_STATUS ErrCode) +void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) { StdOut = StdErr; PrintErr((CHAR16 *)mesg); @@ -170,6 +170,12 @@ void __init PrintErrMesgExit(const CHAR16 *mesg, EFI_STATUS ErrCode) mesg = NULL; break; } +} + + +void __init PrintErrMesgExit(const CHAR16 *mesg, EFI_STATUS ErrCode) +{ + PrintErrMesg(mesg, ErrCode); blexit(mesg); } diff --git a/xen/include/efi/efi-shared.h b/xen/include/efi/efi-shared.h index 30a41e4..d4b6e13 100644 --- a/xen/include/efi/efi-shared.h +++ b/xen/include/efi/efi-shared.h @@ -38,6 +38,7 @@ char *__init w2s(const union string *str); bool_t __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2); void __init PrintErrMesgExit(const CHAR16 *mesg, EFI_STATUS ErrCode); +void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode); EFI_FILE_HANDLE __init get_parent_handle(EFI_LOADED_IMAGE *loaded_image, CHAR16 **leaf);