From patchwork Fri Jan 8 13:08:39 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: 7985661 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 EB740BEEED for ; Fri, 8 Jan 2016 13:11:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CED57201EC for ; Fri, 8 Jan 2016 13:11:13 +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 A7346201C8 for ; Fri, 8 Jan 2016 13:11:12 +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 1aHWmo-0006E1-IK; Fri, 08 Jan 2016 13:08:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHWmk-0006BY-Qb for xen-devel@lists.xen.org; Fri, 08 Jan 2016 13:08:55 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 92/E9-29649-6E4BF865; Fri, 08 Jan 2016 13:08:54 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1452258533!14728205!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 3261 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-5.tower-31.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 relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8B982AD8B; 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:39 +0100 Message-Id: <1452258526-4797-9-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 08/15] xenstore: add error messages to init-xenstore-domain 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 Additional add some diagnostic messages to the program to have an idea why it failed. Signed-off-by: Juergen Gross Acked-by: Ian Campbell Acked-by: Daniel De Graaf --- tools/helpers/init-xenstore-domain.c | 66 ++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index a9c5821..124f29c 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -10,6 +10,7 @@ #include #include #include +#include static uint32_t domid = ~0; @@ -25,69 +26,120 @@ static int build(xc_interface *xch, int argc, char** argv) xs_fd = open("/dev/xen/xenbus_backend", O_RDWR); if ( xs_fd == -1 ) + { + fprintf(stderr, "Could not open /dev/xen/xenbus_backend\n"); return -1; + } rv = xc_flask_context_to_sid(xch, argv[3], strlen(argv[3]), &ssid); if ( rv ) + { + fprintf(stderr, "xc_flask_context_to_sid failed\n"); goto err; + } rv = xc_domain_create(xch, ssid, handle, 0, &domid, NULL); if ( rv ) + { + fprintf(stderr, "xc_domain_create failed\n"); goto err; + } rv = xc_domain_max_vcpus(xch, domid, 1); if ( rv ) + { + fprintf(stderr, "xc_domain_max_vcpus failed\n"); goto err; + } rv = xc_domain_setmaxmem(xch, domid, limit_kb); if ( rv ) + { + fprintf(stderr, "xc_domain_setmaxmem failed\n"); goto err; + } rv = xc_domain_set_memmap_limit(xch, domid, limit_kb); if ( rv ) + { + fprintf(stderr, "xc_domain_set_memmap_limit failed\n"); goto err; + } rv = ioctl(xs_fd, IOCTL_XENBUS_BACKEND_SETUP, domid); if ( rv < 0 ) + { + fprintf(stderr, "Xenbus setup ioctl failed\n"); goto err; + } snprintf(cmdline, 512, "--event %d --internal-db", rv); dom = xc_dom_allocate(xch, cmdline, NULL); rv = xc_dom_kernel_file(dom, argv[1]); if ( rv ) + { + fprintf(stderr, "xc_dom_kernel_file failed\n"); goto err; + } if ( argc > 4 ) { rv = xc_dom_ramdisk_file(dom, argv[4]); if ( rv ) + { + fprintf(stderr, "xc_dom_ramdisk_file failed\n"); goto err; + } } rv = xc_dom_boot_xen_init(dom, xch, domid); if ( rv ) + { + fprintf(stderr, "xc_dom_boot_xen_init failed\n"); goto err; + } rv = xc_dom_parse_image(dom); if ( rv ) + { + fprintf(stderr, "xc_dom_parse_image failed\n"); goto err; + } rv = xc_dom_mem_init(dom, maxmem); if ( rv ) + { + fprintf(stderr, "xc_dom_mem_init failed\n"); goto err; + } rv = xc_dom_boot_mem_init(dom); if ( rv ) + { + fprintf(stderr, "xc_dom_boot_mem_init failed\n"); goto err; + } rv = xc_dom_build_image(dom); if ( rv ) + { + fprintf(stderr, "xc_dom_build_image failed\n"); goto err; + } rv = xc_dom_boot_image(dom); if ( rv ) + { + fprintf(stderr, "xc_dom_boot_image failed\n"); goto err; + } xc_dom_release(dom); dom = NULL; rv = xc_domain_set_virq_handler(xch, domid, VIRQ_DOM_EXC); if ( rv ) + { + fprintf(stderr, "xc_domain_set_virq_handler failed\n"); goto err; + } rv = xc_domain_unpause(xch, domid); if ( rv ) + { + fprintf(stderr, "xc_domain_unpause failed\n"); goto err; + } return 0; @@ -109,14 +161,18 @@ int main(int argc, char** argv) if ( argc < 4 || argc > 5 ) { - printf("Use: %s []\n", - argv[0]); + fprintf(stderr, + "Use: %s []\n", + argv[0]); return 2; } xch = xc_interface_open(NULL, NULL, 0); if ( !xch ) + { + fprintf(stderr, "xc_interface_open() failed\n"); return 1; + } rv = build(xch, argc, argv); @@ -132,12 +188,18 @@ int main(int argc, char** argv) fd = creat("/var/run/xenstored.pid", 0666); if ( fd < 0 ) + { + fprintf(stderr, "Creating /var/run/xenstored.pid failed\n"); return 3; + } rv = snprintf(buf, 16, "domid:%d\n", domid); rv = write(fd, buf, rv); close(fd); if ( rv < 0 ) + { + fprintf(stderr, "Writing domid to /var/run/xenstored.pid failed\n"); return 3; + } return 0; }