From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 1 of 7] libxc: rename safe_strerror to
	_xc_safestrerror and pass XC handle
Date: Thu, 18 Nov 2010 10:50:33 +0000
Message-ID: <61797efad6c24b6b63b0.1290077433@zakaz.uk.xensource.com>
References: <patchbomb.1290077432@zakaz.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-api-bounces-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org>
In-Reply-To: <patchbomb.1290077432-o4Be2W7LfRlXesXXhkcM7miJhflN2719@public.gmane.org>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>,
	<mailto:xen-api-request-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org?subject=unsubscribe>
List-Post: <mailto:xen-api-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org>
List-Help: <mailto:xen-api-request-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>,
	<mailto:xen-api-request-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org?subject=subscribe>
Sender: xen-api-bounces-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org
Errors-To: xen-api-bounces-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org
To: xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org, xen-api-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org
Cc: Ian Campbell <ian.campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User root-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org
# Date 1290077186 18000
# Node ID 61797efad6c24b6b63b03ac0a4532671a1a9a40a
# Parent  a15b0a2dc276ae8eb8cff4cc58d5563848a39b9b
libxc: rename safe_strerror to _xc_safestrerror and pass XC handle.

Signed-off-by: Ian Campbell <ian.campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>

diff -r a15b0a2dc276 -r 61797efad6c2 tools/libxc/ia64/xc_ia64_linux_save.c
--- a/tools/libxc/ia64/xc_ia64_linux_save.c	Tue Nov 09 20:37:46 2010 +0000
+++ b/tools/libxc/ia64/xc_ia64_linux_save.c	Thu Nov 18 05:46:26 2010 -0500
@@ -660,7 +660,7 @@ xc_domain_save(xc_interface *xch, int io
                        FIXME: to be tracked.  */
                     fprintf(stderr, "cannot map mfn page %lx gpfn %lx: %s\n",
                             xc_ia64_p2m_mfn(&p2m_table, N),
-                            N, safe_strerror(errno));
+                            N, _xc_strerror(xch, errno));
                     goto out;
                 }
 
diff -r a15b0a2dc276 -r 61797efad6c2 tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c	Tue Nov 09 20:37:46 2010 +0000
+++ b/tools/libxc/xc_private.c	Thu Nov 18 05:46:26 2010 -0500
@@ -544,7 +544,7 @@ _xc_init_errbuf(void)
     pthread_key_create(&errbuf_pkey, _xc_clean_errbuf);
 }
 
-char *safe_strerror(int errcode)
+char *_xc_strerror(xc_interface *xch, int errcode)
 {
 #define XS_BUFSIZE 32
     char *errbuf;
diff -r a15b0a2dc276 -r 61797efad6c2 tools/libxc/xc_private.h
--- a/tools/libxc/xc_private.h	Tue Nov 09 20:37:46 2010 +0000
+++ b/tools/libxc/xc_private.h	Thu Nov 18 05:46:26 2010 -0500
@@ -74,7 +74,7 @@ struct xc_interface {
     const char *currently_progress_reporting;
 };
 
-char *safe_strerror(int errcode);
+char *_xc_strerror(xc_interface *xch, int errcode);
 void xc_report_error(xc_interface *xch, int code, const char *fmt, ...);
 void xc_reportv(xc_interface *xch, xentoollog_logger *lg, xentoollog_level,
                 int code, const char *fmt, va_list args)
@@ -96,7 +96,7 @@ void xc_report_progress_step(xc_interfac
 
 #define ERROR(_m, _a...)  xc_report_error(xch,XC_INTERNAL_ERROR,_m , ## _a )
 #define PERROR(_m, _a...) xc_report_error(xch,XC_INTERNAL_ERROR,_m \
-                  " (%d = %s)", ## _a , errno, safe_strerror(errno))
+                  " (%d = %s)", ## _a , errno, _xc_strerror(xch, errno))
 
 /*
  * HYPERCALL ARGUMENT BUFFERS