From patchwork Sat Jun 28 01:25:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 32646 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 23FB421309 for ; Sat, 28 Jun 2014 01:27:30 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id m20sf10942172qcx.1 for ; Fri, 27 Jun 2014 18:27:29 -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=p/Y7iBxdcPFuTcFLMnLnWFkUJiYLI0d5j35fNKcLlCI=; b=XovJPptdI1Z5K3Iu5RPnnAdueE1Y1dZZyTJSfHPofwB25A8smblV8GXsxiQDfbmYyP 6eHdokRDLz2hiWogoLDvcMeUF/1KsvYQRSlXAYo4NBk52k+QATVn6PEW0rYUoYQkFJNU T1HJV3YHsT+8Uv90/Ph2vUwjvw4p29GB2/kWiQYBfSjc+s1Wx86BigD2um+Y88MFA5FL nDygtXZbFrFtJ05fJuRdxpSfDLHoCS+sh9LaPwjoi95BheT94UdhUaOHVmEIdBbmcKcO Yn5Nn+GKpvU1MYoQTF04yJwURz1mylS/KA1fRX1fTXVJRRXz1H+Lwe+Dfbyaur5cLw4F WYmA== X-Gm-Message-State: ALoCoQnfIq00eusxcAcdIcgPdxzK+jgH2ZnwVAHzkN9ZgiPfVv+MzTyf+UKvyw5Pehsxm0r3kcFJ X-Received: by 10.58.187.68 with SMTP id fq4mr14590911vec.0.1403918849877; Fri, 27 Jun 2014 18:27:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.114 with SMTP id b105ls829109qgd.16.gmail; Fri, 27 Jun 2014 18:27:29 -0700 (PDT) X-Received: by 10.52.119.179 with SMTP id kv19mr19332294vdb.3.1403918849808; Fri, 27 Jun 2014 18:27:29 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id nu8si7231652vcb.16.2014.06.27.18.27.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Jun 2014 18:27:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jz11so6097714veb.17 for ; Fri, 27 Jun 2014 18:27:29 -0700 (PDT) X-Received: by 10.52.69.172 with SMTP id f12mr19446399vdu.26.1403918849699; Fri, 27 Jun 2014 18:27:29 -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 tc5csp147844vcb; Fri, 27 Jun 2014 18:27:29 -0700 (PDT) X-Received: by 10.140.109.118 with SMTP id k109mr28835312qgf.98.1403918849238; Fri, 27 Jun 2014 18:27:29 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id h6si15971533qcm.9.2014.06.27.18.27.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 27 Jun 2014 18:27:29 -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 1X0hOr-0007F2-Qi; Sat, 28 Jun 2014 01:25:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X0hOq-0007EY-JV for xen-devel@lists.xen.org; Sat, 28 Jun 2014 01:25:52 +0000 Received: from [193.109.254.147:40558] by server-16.bemta-14.messagelabs.com id 4A/92-16986-F991EA35; Sat, 28 Jun 2014 01:25:51 +0000 X-Env-Sender: roy.franz@linaro.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1403918749!14221900!1 X-Originating-IP: [209.85.192.177] 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 30778 invoked from network); 28 Jun 2014 01:25:50 -0000 Received: from mail-pd0-f177.google.com (HELO mail-pd0-f177.google.com) (209.85.192.177) by server-14.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jun 2014 01:25:50 -0000 Received: by mail-pd0-f177.google.com with SMTP id y10so5119458pdj.22 for ; Fri, 27 Jun 2014 18:25:48 -0700 (PDT) X-Received: by 10.66.138.48 with SMTP id qn16mr34827208pab.152.1403918748723; Fri, 27 Jun 2014 18:25:48 -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.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jun 2014 18:25:48 -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:20 +0100 Message-Id: <1403918735-30027-5-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 04/19] rename printErrMsg to PrintErrMesgExit 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.172 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: The function prints an error message, then exits the program. Update name in preparation for adding a print-only version. Signed-off-by: Roy Franz --- xen/arch/x86/efi/boot.c | 10 +++++----- xen/arch/x86/efi/efi-shared.c | 6 +++--- xen/include/efi/efi-shared.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 2d32d7b..89d7954 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -173,7 +173,7 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, CHAR16 *what = NULL; if ( !name ) - PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES); + PrintErrMesgExit(L"No filename", EFI_OUT_OF_RESOURCES); ret = dir_handle->Open(dir_handle, &FileHandle, name, EFI_FILE_MODE_READ, 0); if ( file == &cfg && ret == EFI_NOT_FOUND ) @@ -234,7 +234,7 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, { PrintErr(what); PrintErr(L" failed for "); - PrintErrMesg(name, ret); + PrintErrMesgExit(name, ret); } return 1; @@ -256,7 +256,7 @@ static void __init edd_put_string(u8 *dst, size_t n, const char *src) while ( n-- && *src ) *dst++ = *src++; if ( *src ) - PrintErrMesg(L"Internal error populating EDD info", + PrintErrMesgExit(L"Internal error populating EDD info", EFI_BUFFER_TOO_SMALL); while ( n-- ) *dst++ = ' '; @@ -478,7 +478,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) status = efi_bs->HandleProtocol(ImageHandle, &loaded_image_guid, (void **)&loaded_image); if ( status != EFI_SUCCESS ) - PrintErrMesg(L"No Loaded Image Protocol", status); + PrintErrMesgExit(L"No Loaded Image Protocol", status); xen_phys_start = (UINTN)loaded_image->ImageBase; if ( (xen_phys_start + loaded_image->ImageSize - 1) >> 32 ) @@ -1127,7 +1127,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) - PrintErrMesg(L"Cannot exit boot services", status); + PrintErrMesgExit(L"Cannot exit boot services", status); /* Adjust pointers into EFI. */ efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; diff --git a/xen/arch/x86/efi/efi-shared.c b/xen/arch/x86/efi/efi-shared.c index 0f8618c..ad668cb 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 PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) +void __init PrintErrMesgExit(const CHAR16 *mesg, EFI_STATUS ErrCode) { StdOut = StdErr; PrintErr((CHAR16 *)mesg); @@ -217,7 +217,7 @@ EFI_FILE_HANDLE __init get_parent_handle(EFI_LOADED_IMAGE *loaded_image, if ( ret != EFI_SUCCESS ) { PrintErr(L"Open failed for "); - PrintErrMesg(buffer, ret); + PrintErrMesgExit(buffer, ret); } dir_handle->Close(dir_handle); dir_handle = new_handle; @@ -244,7 +244,7 @@ EFI_FILE_HANDLE __init get_parent_handle(EFI_LOADED_IMAGE *loaded_image, EFI_FILE_MODE_READ, 0); if ( ret != EFI_SUCCESS ) { PrintErr(L"Open failed for "); - PrintErrMesg(buffer, ret); + PrintErrMesgExit(buffer, ret); } dir_handle->Close(dir_handle); dir_handle = new_handle; diff --git a/xen/include/efi/efi-shared.h b/xen/include/efi/efi-shared.h index 214a6ff..30a41e4 100644 --- a/xen/include/efi/efi-shared.h +++ b/xen/include/efi/efi-shared.h @@ -37,7 +37,7 @@ CHAR16 *__init s2w(union string *str); char *__init w2s(const union string *str); bool_t __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2); -void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode); +void __init PrintErrMesgExit(const CHAR16 *mesg, EFI_STATUS ErrCode); EFI_FILE_HANDLE __init get_parent_handle(EFI_LOADED_IMAGE *loaded_image, CHAR16 **leaf);