From patchwork Fri Jan 8 13:08:40 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: 7985621 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 0C8E1BEEE5 for ; Fri, 8 Jan 2016 13:11:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 066282014A for ; Fri, 8 Jan 2016 13:11:12 +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 DFD72201C0 for ; Fri, 8 Jan 2016 13:11:09 +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 1aHWmn-0006DR-UE; Fri, 08 Jan 2016 13:08:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHWmk-0006BT-Pm for xen-devel@lists.xen.org; Fri, 08 Jan 2016 13:08:54 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id F3/F7-30270-6E4BF865; Fri, 08 Jan 2016 13:08:54 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1452258533!14684614!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 13377 invoked from network); 8 Jan 2016 13:08:53 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-3.tower-206.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 8 Jan 2016 13:08:53 -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 C5ED7AD8D; Fri, 8 Jan 2016 13:08:52 +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:40 +0100 Message-Id: <1452258526-4797-10-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 09/15] xenstore: modify init-xenstore-domain parameter syntax 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 init-xenstore-domain takes only positional parameters today. Change this to a more flexible parameter syntax allowing to specify additional options or to omit some. Today the supported usage is: init-xenstore-domain [] Modify this to: init-xenstore-domain --kernel --memory [--flask ] [--ramdisk ] The flask label is made optional in order to support xenstore domains without the need of a flask enabled hypervisor. Signed-off-by: Juergen Gross Acked-by: Ian Campbell --- tools/helpers/init-xenstore-domain.c | 87 +++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 16 deletions(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 124f29c..ff9968f 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -13,16 +14,42 @@ #include static uint32_t domid = ~0; +static char *kernel; +static char *ramdisk; +static char *flask; +static int memory; -static int build(xc_interface *xch, int argc, char** argv) +static struct option options[] = { + { "kernel", 1, NULL, 'k' }, + { "memory", 1, NULL, 'm' }, + { "flask", 1, NULL, 'f' }, + { "ramdisk", 1, NULL, 'r' }, + { NULL, 0, NULL, 0 } +}; + +static void usage(void) +{ + fprintf(stderr, +"Usage:\n" +"\n" +"init-xenstore-domain \n" +"\n" +"where options may include:\n" +"\n" +" --kernel kernel file of the xenstore domain, mandatory\n" +" --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"); +} + +static int build(xc_interface *xch) { char cmdline[512]; uint32_t ssid; xen_domain_handle_t handle = { 0 }; int rv, xs_fd; struct xc_dom_image *dom = NULL; - int maxmem = atoi(argv[2]); - int limit_kb = (maxmem + 1) * 1024; + int limit_kb = (memory + 1) * 1024; xs_fd = open("/dev/xen/xenbus_backend", O_RDWR); if ( xs_fd == -1 ) @@ -31,11 +58,18 @@ static int build(xc_interface *xch, int argc, char** argv) return -1; } - rv = xc_flask_context_to_sid(xch, argv[3], strlen(argv[3]), &ssid); - if ( rv ) + if ( flask ) { - fprintf(stderr, "xc_flask_context_to_sid failed\n"); - goto err; + rv = xc_flask_context_to_sid(xch, flask, strlen(flask), &ssid); + if ( rv ) + { + fprintf(stderr, "xc_flask_context_to_sid failed\n"); + goto err; + } + } + else + { + ssid = SECINITSID_DOMU; } rv = xc_domain_create(xch, ssid, handle, 0, &domid, NULL); if ( rv ) @@ -71,16 +105,16 @@ static int build(xc_interface *xch, int argc, char** argv) snprintf(cmdline, 512, "--event %d --internal-db", rv); dom = xc_dom_allocate(xch, cmdline, NULL); - rv = xc_dom_kernel_file(dom, argv[1]); + rv = xc_dom_kernel_file(dom, kernel); if ( rv ) { fprintf(stderr, "xc_dom_kernel_file failed\n"); goto err; } - if ( argc > 4 ) + if ( ramdisk ) { - rv = xc_dom_ramdisk_file(dom, argv[4]); + rv = xc_dom_ramdisk_file(dom, ramdisk); if ( rv ) { fprintf(stderr, "xc_dom_ramdisk_file failed\n"); @@ -100,7 +134,7 @@ static int build(xc_interface *xch, int argc, char** argv) fprintf(stderr, "xc_dom_parse_image failed\n"); goto err; } - rv = xc_dom_mem_init(dom, maxmem); + rv = xc_dom_mem_init(dom, memory); if ( rv ) { fprintf(stderr, "xc_dom_mem_init failed\n"); @@ -154,16 +188,37 @@ err: int main(int argc, char** argv) { + int opt; xc_interface *xch; struct xs_handle *xsh; char buf[16]; int rv, fd; - if ( argc < 4 || argc > 5 ) + while ( (opt = getopt_long(argc, argv, "", options, NULL)) != -1 ) + { + switch ( opt ) + { + case 'k': + kernel = optarg; + break; + case 'm': + memory = strtol(optarg, NULL, 10); + break; + case 'f': + flask = optarg; + break; + case 'r': + ramdisk = optarg; + break; + default: + usage(); + return 2; + } + } + + if ( optind != argc || !kernel || !memory ) { - fprintf(stderr, - "Use: %s []\n", - argv[0]); + usage(); return 2; } @@ -174,7 +229,7 @@ int main(int argc, char** argv) return 1; } - rv = build(xch, argc, argv); + rv = build(xch); xc_interface_close(xch);