From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v2 06/13] xenstore: destroy xenstore domain in case of error after creating it Date: Fri, 18 Dec 2015 14:14:24 +0100 Message-ID: <1450444471-6454-7-git-send-email-jgross@suse.com> References: <1450444471-6454-1-git-send-email-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1450444471-6454-1-git-send-email-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 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 Cc: Juergen Gross List-Id: xen-devel@lists.xenproject.org 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 --- 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 3dd1255..6dffaef 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) { @@ -76,6 +76,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; } -- 2.6.2