On Wed, 2011-09-21 at 13:59 +0100, Anthony PERARD wrote:
> Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> ---
> tools/libxl/Makefile | 4 +++-
> tools/libxl/gentypes.py | 9 +++++----
> tools/libxl/libxl_internal.h | 1 +
> tools/libxl/libxl_types_internal.idl | 9 +++++++++
> 4 files changed, 18 insertions(+), 5 deletions(-)
> create mode 100644 tools/libxl/libxl_types_internal.idl
>
> diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
> index 330ee6e..1f6b418 100644
> --- a/tools/libxl/Makefile
> +++ b/tools/libxl/Makefile
> @@ -35,7 +35,7 @@ LIBXL_OBJS-$(CONFIG_IA64) += libxl_nocpuid.o
> LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \
> libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
> libxl_internal.o libxl_utils.o libxl_uuid.o
> $(LIBXL_OBJS-y)
> -LIBXL_OBJS += _libxl_types.o libxl_flask.o
> +LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o
>
> $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
> $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl)
>
> @@ -81,8 +81,10 @@ _libxl_paths.h: genpath
> libxl_paths.c: _libxl_paths.h
>
> libxl.h: _libxl_types.h
> +libxl_internal.h: _libxl_types_internal.h
>
> $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): libxl.h
> +$(LIBXL_OBJS): libxl_internal.h
>
> _libxl_type%.h _libxl_type%.c: libxl_type%.idl gentypes.py libxltypes.py
> $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*.c
> diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py
> index c66a33c..ecf5f15 100644
> --- a/tools/libxl/gentypes.py
> +++ b/tools/libxl/gentypes.py
> @@ -150,8 +150,9 @@ if __name__ == '__main__':
>
> f = open(header, "w")
>
> - f.write("""#ifndef __LIBXL_TYPES_H
> -#define __LIBXL_TYPES_H
> + header_define = header.upper().replace('.','_')
> + f.write("""#ifndef %s
> +#define %s
>
> /*
> * DO NOT EDIT.
> @@ -160,7 +161,7 @@ if __name__ == '__main__':
> * "%s"
> */
>
> -""" % " ".join(sys.argv))
> +""" % (header_define, header_define, " ".join(sys.argv)))
>
> for ty in types:
> f.write(libxl_C_type_define(ty) + ";\n")
> @@ -172,7 +173,7 @@ if __name__ == '__main__':
> f.write("extern libxl_enum_string_table %s_string_table[];\n" %
> (ty.typename))
> f.write("\n")
>
> - f.write("""#endif /* __LIBXL_TYPES_H */\n""")
> + f.write("""#endif /* %s */\n""" % (header_define))
> f.close()
>
> print "outputting libxl type implementations to %s" % impl
> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
> index b73b6c4..739e45e 100644
> --- a/tools/libxl/libxl_internal.h
> +++ b/tools/libxl/libxl_internal.h
> @@ -35,6 +35,7 @@
>
> #include "flexarray.h"
> #include "libxl_utils.h"
> +#include "_libxl_types_internal.h"
>
> #define LIBXL_DESTROY_TIMEOUT 10
> #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10
> diff --git a/tools/libxl/libxl_types_internal.idl
> b/tools/libxl/libxl_types_internal.idl
> new file mode 100644
> index 0000000..20236a6
> --- /dev/null
> +++ b/tools/libxl/libxl_types_internal.idl
> @@ -0,0 +1,9 @@
> +namespace("libxl__")
> +
> +libxl__qmp_message_type = Enumeration("qmp_message_type", [
> + (1, "QMP"),
> + (2, "return"),
> + (3, "error"),
> + (4, "event"),
> + (5, "invalid"),
> + ])
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home