From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [PATCH V5 27/32] libxl: libxl-json format and load/store configuration functions
Date: Tue, 13 May 2014 22:54:09 +0100 [thread overview]
Message-ID: <1400018054-26038-28-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1400018054-26038-1-git-send-email-wei.liu2@citrix.com>
Introduce a new format in libxl userdata store called "libxl-json". This
format contains the deserialized version of domain configuration of a
domain.
Two libxl functions to load and store domain configuration are also
introduced. They use the new "libxl-json" format.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
tools/libxl/libxl.h | 10 ++++++++
2 files changed, 78 insertions(+)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index c9475d7..b578a5c 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -5751,6 +5751,74 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src)
for (i = 0; i < 6; i++)
(*dst)[i] = (*src)[i];
}
+
+int libxl_load_domain_configuration(libxl_ctx *ctx, uint32_t domid,
+ libxl_domain_config *d_config)
+{
+ GC_INIT(ctx);
+ uint8_t *data;
+ int rc, len;
+
+ rc = libxl_userdata_retrieve(ctx, domid, "libxl-json", &data, &len);
+ if (rc) {
+ LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc,
+ "Failed to retrieve domain configuration for domain %d",
+ domid);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ if (len == 0) {
+ LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
+ "Configuration data stream empty for domain %d",
+ domid);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ /* Make sure this string ends with \0 -- the parser expects a NULL
+ * terminated string.
+ */
+ if (data[len-1] != '\0') {
+ data = libxl__realloc(gc, data, len + 1);
+ data[len] = '\0';
+ }
+
+ rc = libxl_domain_config_from_json(ctx, d_config, (const char *)data);
+
+out:
+ free(data);
+ GC_FREE;
+ return rc;
+}
+
+int libxl_store_domain_configuration(libxl_ctx *ctx, uint32_t domid,
+ libxl_domain_config *d_config)
+{
+ GC_INIT(ctx);
+ char *d_config_json;
+ int rc;
+
+ d_config_json = libxl_domain_config_to_json(ctx, d_config);
+
+ rc = libxl_userdata_store(ctx, domid, "libxl-json",
+ (const uint8_t *)d_config_json,
+ strlen(d_config_json));
+ if (rc) {
+ LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc,
+ "Failed to store domain configuration for domain %d",
+ domid);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ free(d_config_json);
+
+out:
+ GC_FREE;
+ return rc;
+}
+
/*
* Local variables:
* mode: C
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index d5dfe2e..be722b6 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -1140,6 +1140,8 @@ void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid,
* "xl" domain config file in xl format, Unix line endings
* "libvirt-xml" domain config file in libvirt XML format. See
* http://libvirt.org/formatdomain.html
+ * "libxl-json" domain config file in JSON format, generated by
+ * libxl
*
* libxl does not enforce the registration of userdata userids or the
* semantics of the data. For specifications of the data formats
@@ -1251,6 +1253,14 @@ int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size);
int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec);
int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock);
+/* Load / save domain configuration. The domain configuration is
+ * stored in libxl userdata store.
+ */
+int libxl_load_domain_configuration(libxl_ctx *ctx, uint32_t domid,
+ libxl_domain_config *d_config);
+int libxl_store_domain_configuration(libxl_ctx *ctx, uint32_t domid,
+ libxl_domain_config *d_config);
+
#include <libxl_event.h>
#endif /* LIBXL_H */
--
1.7.10.4
next prev parent reply other threads:[~2014-05-13 21:54 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-13 21:53 [PATCH V5 00/32] JSON infrastructure, new "xl-json" format and domain configuration synchronization Wei Liu
2014-05-13 21:53 ` [PATCH V5 01/32] libxl: make cpupool_qualifier_to_cpupoolid a library function Wei Liu
2014-05-15 16:28 ` Ian Campbell
2014-05-20 14:47 ` Ian Jackson
2014-05-20 17:24 ` Wei Liu
2014-05-21 8:27 ` Ian Campbell
2014-05-21 8:37 ` Comments on LIBXL_HAVE_* defines (Was: Re: [PATCH V5 01/32] libxl: make cpupool_qualifier_to_cpupoolid a library function) Ian Campbell
2014-05-22 9:35 ` George Dunlap
2014-05-27 23:04 ` Wei Liu
2014-05-13 21:53 ` [PATCH V5 02/32] xl / libxl: push parsing of SSID and CPU pool ID down to libxl Wei Liu
2014-05-15 16:38 ` Ian Campbell
2014-05-15 17:11 ` Wei Liu
2014-05-13 21:53 ` [PATCH V5 03/32] xl / libxl: push VCPU affinity pinning " Wei Liu
2014-05-15 0:59 ` Dario Faggioli
2014-05-15 9:24 ` Wei Liu
2014-05-15 15:31 ` Dario Faggioli
2014-05-15 15:37 ` Wei Liu
2014-05-15 16:45 ` Ian Campbell
2014-05-15 17:06 ` Wei Liu
2014-05-15 17:19 ` Wei Liu
2014-05-16 9:51 ` Ian Campbell
2014-05-16 8:10 ` Dario Faggioli
2014-05-16 9:57 ` Ian Campbell
2014-05-16 10:15 ` Wei Liu
2014-05-16 10:28 ` Ian Campbell
2014-05-13 21:53 ` [PATCH V5 04/32] libxl: libxl_uuid_copy now taks a ctx argument Wei Liu
2014-05-15 16:51 ` Ian Campbell
2014-05-15 17:13 ` Wei Liu
2014-05-16 9:46 ` Ian Campbell
2014-05-16 10:18 ` Wei Liu
2014-05-16 10:30 ` Ian Campbell
2014-05-16 11:17 ` Wei Liu
2014-05-16 11:21 ` Wei Liu
2014-05-16 11:23 ` Ian Campbell
2014-05-16 11:28 ` Wei Liu
2014-05-16 11:31 ` Ian Campbell
2014-05-13 21:53 ` [PATCH V5 05/32] xl: remove parsing of "vncviewer" option in xl domain config file Wei Liu
2014-05-20 12:44 ` Ian Campbell
2014-05-13 21:53 ` [PATCH V5 06/32] libxl: fix memory leak in libxl_cpuid_dispose Wei Liu
2014-05-13 21:53 ` [PATCH V5 07/32] libxl.h: document the paradigm of using libxl types Wei Liu
2014-05-20 12:49 ` Ian Campbell
2014-05-20 14:54 ` Ian Jackson
2014-05-20 15:02 ` Ian Campbell
2014-05-13 21:53 ` [PATCH V5 08/32] libxl.h: document libxl_<type>_to_json Wei Liu
2014-05-20 12:50 ` Ian Campbell
2014-05-13 21:53 ` [PATCH V5 09/32] libxl_internal.h: move / add some libxl defbool #define here Wei Liu
2014-05-20 12:51 ` Ian Campbell
2014-05-13 21:53 ` [PATCH V5 10/32] libxl: fix JSON generator for uint64_t Wei Liu
2014-05-20 12:55 ` Ian Campbell
2014-05-20 13:15 ` Wei Liu
2014-05-13 21:53 ` [PATCH V5 11/32] libxl IDL: rename json_fn to json_gen_fn Wei Liu
2014-05-13 21:53 ` [PATCH V5 12/32] libxl_json: introduce libxl__object_from_json Wei Liu
2014-05-13 21:53 ` [PATCH V5 13/32] libxl_internal: make JSON_* types a bit-field Wei Liu
2014-05-13 21:53 ` [PATCH V5 14/32] libxl_internal.h: introduce libxl__json_object_is_{null, number, double} Wei Liu
2014-05-13 21:53 ` [PATCH V5 15/32] libxl_internal.h: introduce libxl__json_object_get_number Wei Liu
2014-05-20 12:56 ` Ian Campbell
2014-05-20 15:11 ` Ian Campbell
2014-05-13 21:53 ` [PATCH V5 16/32] libxl_json: introduce parser functions for builtin types Wei Liu
2014-05-13 21:53 ` [PATCH V5 17/32] libxl_json: allow basic JSON type objects generation Wei Liu
2014-05-13 21:54 ` [PATCH V5 18/32] libxl/gentypes.py: special-case KeyedUnion map handle generation Wei Liu
2014-05-20 13:26 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 19/32] libxl/gentypes.py: don't generate default values Wei Liu
2014-05-20 13:29 ` Ian Campbell
2014-05-20 17:17 ` Wei Liu
2014-05-21 8:31 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 20/32] libxl IDL: generate code to parse libxl__json_object to libxl_FOO struct Wei Liu
2014-05-20 13:35 ` Ian Campbell
2014-06-01 17:43 ` Wei Liu
2014-05-13 21:54 ` [PATCH V5 21/32] libxl/gentest.py: test JSON parser Wei Liu
2014-05-13 21:54 ` [PATCH V5 22/32] libxl: introduce libxl_key_value_list_length Wei Liu
2014-05-20 13:36 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 23/32] libxl: introduce libxl_cpuid_policy_list_length Wei Liu
2014-05-20 13:36 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 24/32] libxl: copy function for builtin types Wei Liu
2014-05-20 13:39 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 25/32] libxl IDL: generate deep copy functions Wei Liu
2014-05-20 13:42 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 26/32] libxl/gentest.py: test " Wei Liu
2014-05-13 21:54 ` Wei Liu [this message]
2014-05-20 14:03 ` [PATCH V5 27/32] libxl: libxl-json format and load/store configuration functions Ian Campbell
2014-06-01 18:41 ` Wei Liu
2014-06-02 16:19 ` Ian Campbell
2014-06-02 19:56 ` Wei Liu
2014-05-20 15:01 ` Ian Jackson
2014-06-01 18:46 ` Wei Liu
2014-05-13 21:54 ` [PATCH V5 28/32] libxl: store up-to-date domain configuration as we create domain Wei Liu
2014-05-20 14:12 ` Ian Campbell
2014-06-01 19:02 ` Wei Liu
2014-06-02 16:21 ` Ian Campbell
2014-05-20 15:04 ` Ian Jackson
2014-05-13 21:54 ` [PATCH V5 29/32] xl: use "libxl-json" format Wei Liu
2014-05-20 14:23 ` Ian Campbell
2014-05-20 15:13 ` Ian Jackson
2014-05-20 15:31 ` Ian Campbell
2014-06-01 19:37 ` Wei Liu
2014-06-02 16:30 ` Ian Campbell
2014-06-03 10:02 ` Wei Liu
2014-06-03 10:34 ` Ian Campbell
2014-05-20 15:11 ` Ian Jackson
2014-05-20 15:15 ` Ian Campbell
2014-05-20 15:39 ` Ian Jackson
2014-06-01 19:18 ` Wei Liu
2014-06-01 19:07 ` Wei Liu
2014-06-02 16:23 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 30/32] libxl: consider force removal of device successful Wei Liu
2014-05-20 14:26 ` Ian Campbell
2014-06-01 19:44 ` Wei Liu
2014-05-20 15:15 ` Ian Jackson
2014-06-01 19:46 ` Wei Liu
2014-05-13 21:54 ` [PATCH V5 31/32] libxl: update domain configuration when updating memory targets Wei Liu
2014-05-20 14:32 ` Ian Campbell
2014-06-01 20:00 ` Wei Liu
2014-05-20 15:21 ` Ian Jackson
2014-05-20 15:35 ` Ian Campbell
2014-05-20 15:44 ` Ian Jackson
2014-05-20 15:55 ` Ian Campbell
2014-05-20 16:03 ` Ian Jackson
2014-05-21 8:38 ` Ian Campbell
2014-06-01 20:51 ` Wei Liu
2014-06-01 20:22 ` Wei Liu
2014-06-02 16:32 ` Ian Campbell
2014-05-13 21:54 ` [PATCH V5 32/32] libxl: synchronize configuration when we plug / unplug device Wei Liu
2014-05-20 14:35 ` Ian Campbell
2014-05-20 15:33 ` Ian Jackson
2014-06-01 20:57 ` Wei Liu
2014-06-02 16:33 ` Ian Campbell
2014-05-21 10:18 ` [PATCH V5 00/32] JSON infrastructure, new "xl-json" format and domain configuration synchronization Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400018054-26038-28-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).