From patchwork Fri Jan 8 13:08:44 2016 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: 7985741 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 42814BEEE5 for ; Fri, 8 Jan 2016 13:11:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 545AE2017E for ; Fri, 8 Jan 2016 13:11:41 +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 607872014A for ; Fri, 8 Jan 2016 13:11:40 +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 1aHWms-0006JZ-BM; Fri, 08 Jan 2016 13:09:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHWmn-0006Bz-HU for xen-devel@lists.xen.org; Fri, 08 Jan 2016 13:08:57 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 6B/BE-31122-9E4BF865; Fri, 08 Jan 2016 13:08:57 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1452258534!7435021!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 4365 invoked from network); 8 Jan 2016 13:08:54 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-13.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 8 Jan 2016 13:08:54 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BBE96AD66; Fri, 8 Jan 2016 13:08:53 +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, 8 Jan 2016 14:08:44 +0100 Message-Id: <1452258526-4797-14-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1452258526-4797-1-git-send-email-jgross@suse.com> References: <1452258526-4797-1-git-send-email-jgross@suse.com> Cc: Juergen Gross Subject: [Xen-devel] [PATCH v3 13/15] xenstore: write xenstore domain data to xenstore 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 After starting the xenstore domain write the basic data (domid, name and memory values) to the xenstore. This makes the domain appear correctly in xl list. Create a stub json object in order to make e.g. xl list -l happy. Add a new option to init-xenstore-domain to be able to specify the domain's name. Signed-off-by: Juergen Gross Acked-by: Ian Campbell --- tools/helpers/Makefile | 6 +++-- tools/helpers/init-xenstore-domain.c | 44 ++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 0325ba2..a05a368 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -15,10 +15,12 @@ $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenlight) -INIT_XENSTORE_DOMAIN_OBJS = init-xenstore-domain.o +INIT_XENSTORE_DOMAIN_OBJS = init-xenstore-domain.o init-dom-json.o +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore) +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenlight) .PHONY: all all: $(PROGS) @@ -27,7 +29,7 @@ xen-init-dom0: $(XEN_INIT_DOM0_OBJS) $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) - $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) .PHONY: install install: all diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 238007b..5c5af2d 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -13,11 +13,14 @@ #include #include +#include "init-dom-json.h" + static uint32_t domid = ~0; static char *kernel; static char *ramdisk; static char *flask; static char *param; +static char *name = "Xenstore"; static int memory; static struct option options[] = { @@ -26,6 +29,7 @@ static struct option options[] = { { "flask", 1, NULL, 'f' }, { "ramdisk", 1, NULL, 'r' }, { "param", 1, NULL, 'p' }, + { "name", 1, NULL, 'n' }, { NULL, 0, NULL, 0 } }; @@ -42,7 +46,8 @@ static void usage(void) " --memory size of the domain in MB, mandatory\n" " --flask optional flask label of the domain\n" " --ramdisk optional ramdisk file for the domain\n" -" --param optional additional parameters for the domain\n"); +" --param optional additional parameters for the domain\n" +" --name name of the domain (default: Xenstore)\n"); } static int build(xc_interface *xch) @@ -216,6 +221,20 @@ static int check_domain(xc_interface *xch) return 0; } +static void do_xs_write(struct xs_handle *xsh, char *path, char *val) +{ + if ( !xs_write(xsh, XBT_NULL, path, val, strlen(val)) ) + fprintf(stderr, "writing %s to xenstore failed.\n", path); +} + +static void do_xs_write_dom(struct xs_handle *xsh, char *path, char *val) +{ + char full_path[64]; + + snprintf(full_path, 64, "/local/domain/%d/%s", domid, path); + do_xs_write(xsh, full_path, val); +} + int main(int argc, char** argv) { int opt; @@ -243,6 +262,9 @@ int main(int argc, char** argv) case 'p': param = optarg; break; + case 'n': + name = optarg; + break; default: usage(); return 2; @@ -274,10 +296,24 @@ int main(int argc, char** argv) if ( rv ) return 1; + rv = gen_stub_json_config(domid); + if ( rv ) + return 3; + xsh = xs_open(0); - rv = snprintf(buf, 16, "%d", domid); - xs_write(xsh, XBT_NULL, "/tool/xenstored/domid", buf, rv); - xs_daemon_close(xsh); + if ( !xsh ) + { + fprintf(stderr, "xs_open() failed.\n"); + return 3; + } + snprintf(buf, 16, "%d", domid); + do_xs_write(xsh, "/tool/xenstored/domid", buf); + do_xs_write_dom(xsh, "domid", buf); + do_xs_write_dom(xsh, "name", name); + snprintf(buf, 16, "%d", memory * 1024); + do_xs_write_dom(xsh, "memory/target", buf); + do_xs_write_dom(xsh, "memory/static-max", buf); + xs_close(xsh); fd = creat("/var/run/xenstored.pid", 0666); if ( fd < 0 )