From patchwork Fri Jan 8 13:08:38 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: 7985751 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 25A079F6FA 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 6C4C6201BB 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 95D8F201B9 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 1aHWmm-0006Ca-O3; Fri, 08 Jan 2016 13:08:56 +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-D9 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 ED/E7-30270-5E4BF865; Fri, 08 Jan 2016 13:08:53 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1452258533!14437969!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 48705 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-8.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 50AD3AD88; 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:38 +0100 Message-Id: <1452258526-4797-8-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 07/15] xenstore: destroy xenstore domain in case of error after creating it 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 When creating a xenstore domain via init-xenstore-domain destroy it in case of an error occurred after calling xc_domain_create(). Signed-off-by: Juergen Gross Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- tools/helpers/init-xenstore-domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 9c47af1..a9c5821 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -11,7 +11,7 @@ #include #include -static uint32_t domid = -1; +static uint32_t domid = ~0; static int build(xc_interface *xch, int argc, char** argv) { @@ -94,6 +94,8 @@ static int build(xc_interface *xch, int argc, char** argv) err: if ( dom ) xc_dom_release(dom); + if ( domid != ~0 ) + xc_domain_destroy(xch, domid); close(xs_fd); return rv; }