Re: [Xen-devel] [PATCH] libxl: handle errors from xc_sharing_* info functions

[Andres Lagar-Cavilla <andreslc@xxxxxxxxxxxxxx>]

On Sep 3, 2012, at 8:48 AM, Ian Campbell wrote:

> # HG changeset patch
> # User Ian Campbell <ian.campbell@xxxxxxxxxx>
> # Date 1346676461 -3600
> # Node ID 99b7a5af9b3059bac2732a601fb1d574b9f02975
> # Parent  c4e822e1b491bb7efa962b38fff6f007f01596b5
> libxl: handle errors from xc_sharing_* info functions
> 
> On a 32 bit hypervisor xl info currently reports:
> sharing_freed_memory   : 72057594037927935
> sharing_used_memory    : 72057594037927935
> 
> Eat the ENOSYS and turn it into 0. Log and propagate other errors.
> 
> I don't have a 32 bit system handy, so tested on x86_64 with a libxc
> hacked to return -ENOSYS and -EINVAL.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>

Good catch!
Andres
> 
> diff -r c4e822e1b491 -r 99b7a5af9b30 tools/libxl/libxl.c
> --- a/tools/libxl/libxl.c     Mon Sep 03 09:59:35 2012 +0100
> +++ b/tools/libxl/libxl.c     Mon Sep 03 13:47:41 2012 +0100
> @@ -3622,6 +3622,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, l
> {
>     xc_physinfo_t xcphysinfo = { 0 };
>     int rc;
> +    long l;
> 
>     rc = xc_physinfo(ctx->xch, &xcphysinfo);
>     if (rc != 0) {
> @@ -3636,8 +3637,20 @@ int libxl_get_physinfo(libxl_ctx *ctx, l
>     physinfo->total_pages = xcphysinfo.total_pages;
>     physinfo->free_pages = xcphysinfo.free_pages;
>     physinfo->scrub_pages = xcphysinfo.scrub_pages;
> -    physinfo->sharing_freed_pages = xc_sharing_freed_pages(ctx->xch);
> -    physinfo->sharing_used_frames = xc_sharing_used_frames(ctx->xch);
> +    l = xc_sharing_freed_pages(ctx->xch);
> +    if ( l < 0 && l != -ENOSYS ) {
> +        LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, l,
> +                            "getting sharing freed pages");
> +        return ERROR_FAIL;
> +    }
> +    physinfo->sharing_freed_pages = (l == -ENOSYS) ? 0 : l;
> +    l = xc_sharing_used_frames(ctx->xch);
> +    if ( l < 0 && l != -ENOSYS ) {
> +        LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, l,
> +                            "getting sharing used frames");
> +        return ERROR_FAIL;
> +    }
> +    physinfo->sharing_used_frames = (l == -ENOSYS) ? 0 : l;
>     physinfo->nr_nodes = xcphysinfo.nr_nodes;
>     memcpy(physinfo->hw_cap,xcphysinfo.hw_cap, sizeof(physinfo->hw_cap));
> 


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel