[Xen-devel] Re: [PATCH 27 of 27 v2] imported patch libxl-flags-on-ctx-alloc.patch

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2011-10-13 at 10:53 +0100, Ian Campbell wrote:
> # HG changeset patch
> # User Ian Campbell <ian.campbell@xxxxxxxxxx>
> # Date 1318499566 -3600
> # Node ID ed4bd6824e5e4f751bf1b77a70a514111aaa077e
> # Parent  090e45b2fdcadd82d7373db52d84d1c0e5442a29
> imported patch libxl-flags-on-ctx-alloc.patch

Hmm. seems the comment for this one didn't get done right. Ignore it for
now, it was more of an addendum anyway.

> 
> diff -r 090e45b2fdca -r ed4bd6824e5e tools/libxl/gentest.py
> --- a/tools/libxl/gentest.py  Thu Oct 13 10:52:46 2011 +0100
> +++ b/tools/libxl/gentest.py  Thu Oct 13 10:52:46 2011 +0100
> @@ -239,7 +239,7 @@ int main(int argc, char **argv)
>      logger = xtl_createlogger_stdiostream(stderr, XTL_DETAIL, 0);
>      if (!logger) exit(1);
>  
> -    if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, (xentoollog_logger*)logger)) {
> +    if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger*)logger)) 
> {
>          fprintf(stderr, "cannot init xl context\\n");
>          exit(1);
>      }
> diff -r 090e45b2fdca -r ed4bd6824e5e tools/libxl/libxl.c
> --- a/tools/libxl/libxl.c     Thu Oct 13 10:52:46 2011 +0100
> +++ b/tools/libxl/libxl.c     Thu Oct 13 10:52:46 2011 +0100
> @@ -39,7 +39,8 @@
>  #define PAGE_TO_MEMKB(pages) ((pages) * 4)
>  #define BACKEND_STRING_SIZE 5
>  
> -int libxl_ctx_alloc(libxl_ctx **pctx, int version, xentoollog_logger * lg)
> +int libxl_ctx_alloc(libxl_ctx **pctx, int version,
> +                    unsigned flags, xentoollog_logger * lg)
>  {
>      libxl_ctx *ctx;
>      struct stat stat_buf;
> diff -r 090e45b2fdca -r ed4bd6824e5e tools/libxl/libxl.h
> --- a/tools/libxl/libxl.h     Thu Oct 13 10:52:46 2011 +0100
> +++ b/tools/libxl/libxl.h     Thu Oct 13 10:52:46 2011 +0100
> @@ -245,7 +245,9 @@ typedef struct {
>  } libxl_domain_config;
>  
>  /* context functions */
> -int libxl_ctx_alloc(libxl_ctx **pctx, int version, xentoollog_logger *lg);
> +int libxl_ctx_alloc(libxl_ctx **pctx, int version,
> +                    unsigned flags /* none currently defined */,
> +                    xentoollog_logger *lg);
>  int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */);
>  int libxl_ctx_postfork(libxl_ctx *ctx);
>  
> diff -r 090e45b2fdca -r ed4bd6824e5e tools/libxl/xl.c
> --- a/tools/libxl/xl.c        Thu Oct 13 10:52:46 2011 +0100
> +++ b/tools/libxl/xl.c        Thu Oct 13 10:52:46 2011 +0100
> @@ -116,7 +116,7 @@ int main(int argc, char **argv)
>      logger = xtl_createlogger_stdiostream(stderr, minmsglevel,  0);
>      if (!logger) exit(1);
>  
> -    if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, (xentoollog_logger*)logger)) {
> +    if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger*)logger)) 
> {
>          fprintf(stderr, "cannot init xl context\n");
>          exit(1);
>      }
> diff -r 090e45b2fdca -r ed4bd6824e5e tools/ocaml/libs/xl/xenlight_stubs.c
> --- a/tools/ocaml/libs/xl/xenlight_stubs.c    Thu Oct 13 10:52:46 2011 +0100
> +++ b/tools/ocaml/libs/xl/xenlight_stubs.c    Thu Oct 13 10:52:46 2011 +0100
> @@ -59,7 +59,7 @@ static void log_destroy(struct xentoollo
>       lg.logger.destroy = log_destroy; \
>       lg.logger.progress = NULL; \
>       caml_enter_blocking_section(); \
> -     ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, (struct xentoollog_logger *) 
> &lg); \
> +     ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (struct xentoollog_logger 
> *) &lg); \
>       if (ret != 0) \
>               failwith_xl("cannot init context", &lg);
>  
> diff -r 090e45b2fdca -r ed4bd6824e5e tools/python/xen/lowlevel/xl/xl.c
> --- a/tools/python/xen/lowlevel/xl/xl.c       Thu Oct 13 10:52:46 2011 +0100
> +++ b/tools/python/xen/lowlevel/xl/xl.c       Thu Oct 13 10:52:46 2011 +0100
> @@ -687,7 +687,7 @@ PyXl_init(XlObject *self, PyObject *args
>          return -1;
>      }
>  
> -    if ( libxl_ctx_alloc(&self->ctx, LIBXL_VERSION,
> +    if ( libxl_ctx_alloc(&self->ctx, LIBXL_VERSION, 0,
>                  (xentoollog_logger*)self->logger) ) {
>          PyErr_SetString(xl_error_obj, "cannot init xl context");
>          return -1;



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