From patchwork Mon Jan 18 08:03:59 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: 8053371 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 398EC9F859 for ; Mon, 18 Jan 2016 08:07:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6927620259 for ; Mon, 18 Jan 2016 08:07:40 +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 7CBF32025A for ; Mon, 18 Jan 2016 08:07:39 +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 1aL4nh-0007sE-K0; Mon, 18 Jan 2016 08:04:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aL4ne-0007nR-9D for xen-devel@lists.xen.org; Mon, 18 Jan 2016 08:04:30 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id CC/8D-09708-D8C9C965; Mon, 18 Jan 2016 08:04:29 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1453104269!10619258!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 8627 invoked from network); 18 Jan 2016 08:04:29 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-10.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 18 Jan 2016 08:04:29 -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 54D26AC87; Mon, 18 Jan 2016 08:04:28 +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: Mon, 18 Jan 2016 09:03:59 +0100 Message-Id: <1453104244-6268-10-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1453104244-6268-1-git-send-email-jgross@suse.com> References: <1453104244-6268-1-git-send-email-jgross@suse.com> Cc: Juergen Gross Subject: [Xen-devel] [PATCH v4 09/14] xenstore: make use of the "xenstore domain" flag 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 Create the xenstore domain with the xenstore flag specified. This enables us to test whether such a domain is already running before we create it. As there ought to be only one xenstore in the system we don't need to start another one. Signed-off-by: Juergen Gross Acked-by: Ian Campbell --- V3: omit dom0 when checking for xenstore domain as suggested by Ian Campbell log an error in case of an error when obtaining domain info as requested by Ian Campbell Signed-off-by: Juergen Gross --- tools/helpers/init-xenstore-domain.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index ff9968f..ecced04 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -71,7 +71,8 @@ static int build(xc_interface *xch) { ssid = SECINITSID_DOMU; } - rv = xc_domain_create(xch, ssid, handle, 0, &domid, NULL); + rv = xc_domain_create(xch, ssid, handle, XEN_DOMCTL_CDF_xs_domain, + &domid, NULL); if ( rv ) { fprintf(stderr, "xc_domain_create failed\n"); @@ -186,6 +187,28 @@ err: return rv; } +static int check_domain(xc_interface *xch) +{ + xc_dominfo_t info; + uint32_t dom; + int ret; + + dom = 1; + while ( (ret = xc_domain_getinfo(xch, dom, 1, &info)) == 1 ) + { + if ( info.xenstore ) + return 1; + dom = info.domid + 1; + } + if ( ret < 0 && errno != ESRCH ) + { + fprintf(stderr, "xc_domain_getinfo failed\n"); + return ret; + } + + return 0; +} + int main(int argc, char** argv) { int opt; @@ -229,7 +252,12 @@ int main(int argc, char** argv) return 1; } - rv = build(xch); + rv = check_domain(xch); + + if ( !rv ) + rv = build(xch); + else if ( rv > 0 ) + fprintf(stderr, "xenstore domain already present.\n"); xc_interface_close(xch);