WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] [PATCH] xl: libxl_dominfo.shutdown_reason is a number no

To: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
Subject: Re: [Xen-devel] [PATCH] xl: libxl_dominfo.shutdown_reason is a number not a string
From: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>
Date: Wed, 8 Sep 2010 16:46:23 +0100
Cc: "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>
Delivery-date: Wed, 08 Sep 2010 09:04:26 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <19591.44428.893247.390280@xxxxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Organization: Citrix Systems, Inc.
References: <13554f2ce7cd77476feb.1283777943@xxxxxxxxxxxxxxxxxxxxx> <19591.44428.893247.390280@xxxxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Thanks, looks sane to me.

On Wed, 2010-09-08 at 16:36 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[Xen-devel] [PATCH] xl: libxl_dominfo.shutdown_reason 
> is a number not a string"):
> > xl: libxl_dominfo.shutdown_reason is a number not a string
> 
> Thanks.  I added __attribute__((format..)) to the appropriate place,
> and that found an additional bug.  I have that improvement, the other
> fix, and your patch, all together.
> 
> # HG changeset patch
> # User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
> # Date 1283960140 -3600
> # Node ID 9d6fcb72ae5f24704c592e3600b6f406c80dec7f
> # Parent  fc866633d0ebb7b0982c5d5ddd62d3a7a70e6d5b
> xl: correct calls to dolog() (aka LOG)
> 
> dolog, for which LOG is a macro wrapper, was lacking the printf format
> attribute.  Add it, and fix the two problems revealed.
> 
> (Original patch for one of the occurrences from Ian Campbell.)
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> 
> diff -r fc866633d0eb -r 9d6fcb72ae5f tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c        Wed Sep 08 16:24:20 2010 +0100
> +++ b/tools/libxl/xl_cmdimpl.c        Wed Sep 08 16:35:40 2010 +0100
> @@ -235,6 +235,9 @@ static void find_domain(const char *p)
>  }
>  
>  #define LOG(_f, _a...)   dolog(__FILE__, __LINE__, __func__, _f "\n", ##_a)
> +
> +static void dolog(const char *file, int line, const char *func, char *fmt, 
> ...)
> +     __attribute__((format(printf,4,5)));
>  
>  static void dolog(const char *file, int line, const char *func, char *fmt, 
> ...)
>  {
> @@ -1123,7 +1126,7 @@ static int handle_domain_death(libxl_ctx
>          action = d_config->on_watchdog;
>          break;
>      default:
> -        LOG("Unknown shutdown reason code %s. Destroying domain.", 
> info->shutdown_reason);
> +        LOG("Unknown shutdown reason code %d. Destroying domain.", 
> info->shutdown_reason);
>          action = ACTION_DESTROY;
>      }
>  
> @@ -1537,7 +1540,7 @@ start:
>          }
>          rc = libxl_create_logfile(&ctx, name, &fullname);
>          if (rc) {
> -            LOG("failed to open logfile %s",fullname,strerror(errno));
> +            LOG("failed to open logfile %s: %s",fullname,strerror(errno));
>              exit(-1);
>          }
>  
> 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>