mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Anthony PERARD
f6c6f2679d
- libxl changes: While doing so, we rename all "*_gen_json" function to "*_gen_jso" as they have different prototype. All the function pointer are been cast to (libxl__gen_json_callback) by "gentypes.py" when generating "*_to_json()" functions. We also introduce a few more "*_gen_jso" functions for "int" and "bool" because we can't use json_object_*() functions from json-c directly like it's done with yajl. To make the generation of _libxl_types*json.[ch] with both YAJL and json-c we add "--libjsonc" to gentypes.py so it can generate functions/types for both. Also introducing "jsonc_json_gen_fn" in the IDL, to be able to point to a different function when using json-c. Also, don't export any of the new *_gen_jso() function, at the cost of having "_hidden" macro in semi-public headers. - xl changes: Also, rework the implementation of printf_info() in `xl` to avoid using libxl_domain_config_gen_json() which isn't available without YAJL. The implementation using "json_object" call libxl_domain_config_to_json() which generate a plain string of JSON, which we parse to add it to our own json; this avoid a dependency on the json library used by libxl. Signed-off-by: Anthony PERARD <anthony.perard@vates.tech> Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
121 lines
4.0 KiB
C
121 lines
4.0 KiB
C
/*
|
|
* Copyright (C) 2011 Citrix Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published
|
|
* by the Free Software Foundation; version 2.1 only. with the special
|
|
* exception on linking described in file LICENSE.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*/
|
|
|
|
#ifndef LIBXL_JSON_H
|
|
#define LIBXL_JSON_H
|
|
|
|
#ifdef HAVE_LIBJSONC
|
|
#include <json-c/json.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_LIBYAJL
|
|
#include <yajl/yajl_gen.h>
|
|
#include <yajl/yajl_parse.h>
|
|
|
|
#ifdef HAVE_YAJL_YAJL_VERSION_H
|
|
# include <yajl/yajl_version.h>
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef HAVE_LIBJSONC
|
|
#ifndef _hidden
|
|
#define _hidden
|
|
#endif
|
|
_hidden int libxl__uint64_gen_jso(json_object **jso_r, uint64_t val);
|
|
_hidden int libxl_defbool_gen_jso(json_object **jso_r, libxl_defbool *p);
|
|
_hidden int libxl_uuid_gen_jso(json_object **jso_r, libxl_uuid *p);
|
|
_hidden int libxl_mac_gen_jso(json_object **jso_r, libxl_mac *p);
|
|
_hidden int libxl_bitmap_gen_jso(json_object **jso_r, libxl_bitmap *p);
|
|
_hidden int libxl_cpuid_policy_list_gen_jso(json_object **jso_r,libxl_cpuid_policy_list *p);
|
|
_hidden int libxl_string_list_gen_jso(json_object **jso_r,libxl_string_list *p);
|
|
_hidden int libxl_key_value_list_gen_jso(json_object **jso_r, libxl_key_value_list *p);
|
|
_hidden int libxl_hwcap_gen_jso(json_object **jso_r, libxl_hwcap *p);
|
|
_hidden int libxl_ms_vm_genid_gen_jso(json_object **jso_r, libxl_ms_vm_genid *p);
|
|
#endif
|
|
#if defined(HAVE_LIBYAJL)
|
|
yajl_gen_status libxl__uint64_gen_json(yajl_gen hand, uint64_t val);
|
|
yajl_gen_status libxl_defbool_gen_json(yajl_gen hand, libxl_defbool *p);
|
|
yajl_gen_status libxl_uuid_gen_json(yajl_gen hand, libxl_uuid *p);
|
|
yajl_gen_status libxl_mac_gen_json(yajl_gen hand, libxl_mac *p);
|
|
yajl_gen_status libxl_bitmap_gen_json(yajl_gen hand, libxl_bitmap *p);
|
|
yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand,
|
|
libxl_cpuid_policy_list *p);
|
|
yajl_gen_status libxl_string_list_gen_json(yajl_gen hand, libxl_string_list *p);
|
|
yajl_gen_status libxl_key_value_list_gen_json(yajl_gen hand,
|
|
libxl_key_value_list *p);
|
|
yajl_gen_status libxl_hwcap_gen_json(yajl_gen hand, libxl_hwcap *p);
|
|
yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p);
|
|
#endif
|
|
|
|
#include <_libxl_types_json.h>
|
|
|
|
/* YAJL version check */
|
|
#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1)
|
|
# define HAVE_YAJL_V2 1
|
|
#endif
|
|
|
|
#ifdef HAVE_LIBYAJL
|
|
#ifdef HAVE_YAJL_V2
|
|
|
|
typedef size_t libxl_yajl_length;
|
|
|
|
static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks,
|
|
yajl_alloc_funcs *allocFuncs,
|
|
void *ctx)
|
|
{
|
|
yajl_handle hand = yajl_alloc(callbacks, allocFuncs, ctx);
|
|
if (hand)
|
|
yajl_config(hand, yajl_allow_trailing_garbage, 1);
|
|
return hand;
|
|
}
|
|
|
|
static inline yajl_gen libxl_yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
|
|
{
|
|
yajl_gen g;
|
|
g = yajl_gen_alloc(allocFuncs);
|
|
if (g)
|
|
yajl_gen_config(g, yajl_gen_beautify, 1);
|
|
return g;
|
|
}
|
|
|
|
#else /* !HAVE_YAJL_V2 */
|
|
|
|
#define yajl_complete_parse yajl_parse_complete
|
|
|
|
typedef unsigned int libxl_yajl_length;
|
|
|
|
static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks,
|
|
const yajl_alloc_funcs *allocFuncs,
|
|
void *ctx)
|
|
{
|
|
yajl_parser_config cfg = {
|
|
.allowComments = 1,
|
|
.checkUTF8 = 1,
|
|
};
|
|
return yajl_alloc(callbacks, &cfg, allocFuncs, ctx);
|
|
}
|
|
|
|
static inline yajl_gen libxl_yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
|
|
{
|
|
yajl_gen_config conf = { 1, " " };
|
|
return yajl_gen_alloc(&conf, allocFuncs);
|
|
}
|
|
|
|
#endif /* !HAVE_YAJL_V2 */
|
|
#else
|
|
typedef size_t libxl_yajl_length;
|
|
#endif /* !HAVE_LIBYAJL */
|
|
|
|
#endif /* LIBXL_JSON_H */
|