From patchwork Fri Dec 18 13:14:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 7883741 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 6A149BEEE5 for ; Fri, 18 Dec 2015 13:17:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A165E2049C for ; Fri, 18 Dec 2015 13:17:35 +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 C97F620494 for ; Fri, 18 Dec 2015 13:17:34 +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 1a9urq-0000Yn-KD; Fri, 18 Dec 2015 13:14:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9urp-0000Y1-Op for xen-devel@lists.xen.org; Fri, 18 Dec 2015 13:14:41 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B5/3F-24450-1C604765; Fri, 18 Dec 2015 13:14:41 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450444480!8168443!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 57219 invoked from network); 18 Dec 2015 13:14:40 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-8.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 18 Dec 2015 13:14:40 -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 3595EAC72; Fri, 18 Dec 2015 13:14:40 +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:27 +0100 Message-Id: <1450444471-6454-10-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 09/13] 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 xs_domain 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 --- tools/helpers/init-xenstore-domain.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 17f0151..4cd9e0f 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -66,7 +66,8 @@ static int build(xc_interface *xch) } else { 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"); goto err; @@ -165,6 +166,21 @@ err: return rv; } +static int check_domain(xc_interface *xch) +{ + xc_dominfo_t info; + uint32_t dom; + + dom = 0; + while (xc_domain_getinfo(xch, dom, 1, &info) == 1) { + if (info.xs_domain) + return 1; + dom = info.domid + 1; + } + + return 0; +} + int main(int argc, char** argv) { int opt; @@ -204,7 +220,12 @@ int main(int argc, char** argv) return 1; } - rv = build(xch); + rv = check_domain(xch); + + if (!rv) + rv = build(xch); + else + fprintf(stderr, "xenstore domain already present.\n"); xc_interface_close(xch);