From patchwork Fri Dec 18 13:14:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 7883681 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2F8229F1AF for ; Fri, 18 Dec 2015 13:17:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 214922049C for ; Fri, 18 Dec 2015 13:17:07 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC42520494 for ; Fri, 18 Dec 2015 13:17:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9urs-0000Zu-MN; Fri, 18 Dec 2015 13:14:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9urs-0000XX-0w for xen-devel@lists.xen.org; Fri, 18 Dec 2015 13:14:44 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 18/6D-18316-3C604765; Fri, 18 Dec 2015 13:14:43 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450444481!1709095!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11407 invoked from network); 18 Dec 2015 13:14:42 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-16.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 18 Dec 2015 13:14:42 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 22391ACDE; Fri, 18 Dec 2015 13:14:41 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xen.org, Ian.Campbell@citrix.com, ian.jackson@eu.citrix.com, stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com, dgdegra@tycho.nsa.gov Date: Fri, 18 Dec 2015 14:14:29 +0100 Message-Id: <1450444471-6454-12-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1450444471-6454-1-git-send-email-jgross@suse.com> References: <1450444471-6454-1-git-send-email-jgross@suse.com> Cc: Juergen Gross Subject: [Xen-devel] [PATCH v2 11/13] tools: split up xen-init-dom0.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Split up tools/helpers/xen-init-dom0.c in order to prepare reusing generation of the json configuration by init-xenstore-domain.c. Signed-off-by: Juergen Gross --- tools/helpers/Makefile | 2 +- tools/helpers/init-dom-json.c | 59 ++++++++++++++++++++++++++++++++++ tools/helpers/init-dom-json.h | 18 +++++++++++ tools/helpers/xen-init-dom0.c | 73 ++++++------------------------------------- 4 files changed, 88 insertions(+), 64 deletions(-) create mode 100644 tools/helpers/init-dom-json.c create mode 100644 tools/helpers/init-dom-json.h diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 92aead4..cfb86f5 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -10,7 +10,7 @@ ifeq ($(CONFIG_Linux),y) PROGS += init-xenstore-domain endif -XEN_INIT_DOM0_OBJS = xen-init-dom0.o +XEN_INIT_DOM0_OBJS = xen-init-dom0.o init-dom-json.o $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenlight) diff --git a/tools/helpers/init-dom-json.c b/tools/helpers/init-dom-json.c new file mode 100644 index 0000000..91b1fdf --- /dev/null +++ b/tools/helpers/init-dom-json.c @@ -0,0 +1,59 @@ +#include +#include +#include +#include +#include + +#include +#include + +int gen_stub_json_config(uint32_t domid) +{ + int rc = 1; + xentoollog_logger_stdiostream *logger; + libxl_ctx *ctx; + libxl_domain_config dom_config; + char *json = NULL; + + logger = xtl_createlogger_stdiostream(stderr, XTL_ERROR, 0); + if (!logger) + return 1; + + if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, + (xentoollog_logger *)logger)) { + fprintf(stderr, "cannot init libxl context\n"); + goto outlog; + } + + libxl_domain_config_init(&dom_config); + + /* Generate stub JSON config. */ + dom_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; + libxl_domain_build_info_init_type(&dom_config.b_info, + LIBXL_DOMAIN_TYPE_PV); + + json = libxl_domain_config_to_json(ctx, &dom_config); + /* libxl-json format requires the string ends with '\0'. Code + * snippet taken from libxl. + */ + rc = libxl_userdata_store(ctx, domid, "libxl-json", + (const uint8_t *)json, + strlen(json) + 1 /* include '\0' */); + if (rc) + fprintf(stderr, "cannot store stub json config for domain %u\n", domid); + + libxl_domain_config_dispose(&dom_config); + free(json); + libxl_ctx_free(ctx); +outlog: + xtl_logger_destroy((xentoollog_logger *)logger); + return rc; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/helpers/init-dom-json.h b/tools/helpers/init-dom-json.h new file mode 100644 index 0000000..58c85df --- /dev/null +++ b/tools/helpers/init-dom-json.h @@ -0,0 +1,18 @@ +#ifndef __INIT_DOM_JSON_H +#define __INIT_DOM_JSON_H + +/* + * Generate a stub JSON config for a domain with the given domid. + */ +int gen_stub_json_config(uint32_t domid); + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/helpers/xen-init-dom0.c b/tools/helpers/xen-init-dom0.c index 7925d64..9ab8468 100644 --- a/tools/helpers/xen-init-dom0.c +++ b/tools/helpers/xen-init-dom0.c @@ -1,65 +1,26 @@ -#include #include #include #include #include -#include #include -#include + +#include "init-dom-json.h" #define DOMNAME_PATH "/local/domain/0/name" #define DOMID_PATH "/local/domain/0/domid" -static libxl_ctx *ctx; -static xentoollog_logger_stdiostream *logger; -static struct xs_handle *xsh; - -static void ctx_alloc(void) +int main(int argc, char **argv) { - if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, - (xentoollog_logger *)logger)) { - fprintf(stderr, "cannot init libxl context\n"); - exit(1); - } + int rc; + struct xs_handle *xsh; + char *domname_string = NULL, *domid_string = NULL; + xsh = xs_open(0); if (!xsh) { fprintf(stderr, "cannot open xenstore connection\n"); exit(1); } -} - -static void ctx_free(void) -{ - if (ctx) { - libxl_ctx_free(ctx); - ctx = NULL; - } - if (logger) { - xtl_logger_destroy((xentoollog_logger *)logger); - logger = NULL; - } - if (xsh) { - xs_close(xsh); - xsh = NULL; - } -} - -int main(int argc, char **argv) -{ - int rc; - libxl_domain_config dom0_config; - char *domname_string = NULL, *domid_string = NULL; - char *json = NULL;; - - logger = xtl_createlogger_stdiostream(stderr, XTL_ERROR, 0); - if (!logger) exit(1); - - atexit(ctx_free); - - ctx_alloc(); - - libxl_domain_config_init(&dom0_config); /* Sanity check: this program can only be run once. */ domid_string = xs_read(xsh, XBT_NULL, DOMID_PATH, NULL); @@ -70,22 +31,9 @@ int main(int argc, char **argv) goto out; } - /* Generate stub JSON config. */ - dom0_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; - libxl_domain_build_info_init_type(&dom0_config.b_info, - LIBXL_DOMAIN_TYPE_PV); - - json = libxl_domain_config_to_json(ctx, &dom0_config); - /* libxl-json format requires the string ends with '\0'. Code - * snippet taken from libxl. - */ - rc = libxl_userdata_store(ctx, 0, "libxl-json", - (const uint8_t *)json, - strlen(json) + 1 /* include '\0' */); - if (rc) { - fprintf(stderr, "cannot store stub json config for Dom0\n"); + rc = gen_stub_json_config(0); + if (rc) goto out; - } /* Write xenstore entries. */ if (!xs_write(xsh, XBT_NULL, DOMID_PATH, "0", strlen("0"))) { @@ -104,10 +52,9 @@ int main(int argc, char **argv) printf("Done setting up Dom0\n"); out: - libxl_domain_config_dispose(&dom0_config); free(domid_string); free(domname_string); - free(json); + xs_close(xsh); return rc; }