[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] libxl_internal.h: move / add some libxl defbool #define here
commit a84725c201cffe714b91ace83b5dd381c879ba5b Author: Wei Liu <wei.liu2@xxxxxxxxxx> AuthorDate: Tue May 13 22:53:51 2014 +0100 Commit: Ian Campbell <ian.campbell@xxxxxxxxxx> CommitDate: Wed May 21 11:00:30 2014 +0100 libxl_internal.h: move / add some libxl defbool #define here They will be used by both JSON generator and parser so they should be in header file. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- tools/libxl/libxl.c | 10 +++------- tools/libxl/libxl_internal.h | 8 ++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4ea7abb..900b8d4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -232,10 +232,6 @@ void libxl_key_value_list_dispose(libxl_key_value_list *pkvl) free(kvl); } -#define LIBXL__DEFBOOL_DEFAULT (0) -#define LIBXL__DEFBOOL_FALSE (-1) -#define LIBXL__DEFBOOL_TRUE (1) - void libxl_defbool_set(libxl_defbool *db, bool b) { db->val = b ? LIBXL__DEFBOOL_TRUE : LIBXL__DEFBOOL_FALSE; @@ -266,11 +262,11 @@ bool libxl_defbool_val(libxl_defbool db) const char *libxl_defbool_to_string(libxl_defbool b) { if (b.val < 0) - return "False"; + return LIBXL__DEFBOOL_STR_FALSE; else if (b.val > 0) - return "True"; + return LIBXL__DEFBOOL_STR_TRUE; else - return "<default>"; + return LIBXL__DEFBOOL_STR_DEFAULT; } /******************************************************************************/ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c2b73c4..294c595 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3036,6 +3036,14 @@ void libxl__numa_candidate_put_nodemap(libxl__gc *gc, libxl_bitmap_copy(CTX, &cndt->nodemap, nodemap); } +/* Som handy macros for defbool type. */ +#define LIBXL__DEFBOOL_DEFAULT (0) +#define LIBXL__DEFBOOL_FALSE (-1) +#define LIBXL__DEFBOOL_TRUE (1) +#define LIBXL__DEFBOOL_STR_DEFAULT "<default>" +#define LIBXL__DEFBOOL_STR_FALSE "False" +#define LIBXL__DEFBOOL_STR_TRUE "True" + /* * Inserts "elm_new" into the sorted list "head". * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |