All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juergen Gross <jgross@suse.com>
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 <jgross@suse.com>
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	[thread overview]
Message-ID: <1450444471-6454-7-git-send-email-jgross@suse.com> (raw)
In-Reply-To: <1450444471-6454-1-git-send-email-jgross@suse.com>

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 <jgross@suse.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
---
 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 <xenstore.h>
 #include <xen/sys/xenbus_dev.h>
 
-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

  parent reply	other threads:[~2015-12-18 13:14 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-18 13:14 [PATCH v2 00/13] xenstore: make it easier to run xenstore in a domain Juergen Gross
2015-12-18 13:14 ` [PATCH v2 01/13] xen: add xenstore domain flag to hypervisor Juergen Gross
2015-12-18 13:23   ` Andrew Cooper
2016-01-05 15:46   ` Ian Campbell
2016-01-05 15:59     ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 02/13] libxc: support new xenstore domain flag in libxc Juergen Gross
2016-01-06 15:52   ` Ian Campbell
2016-01-07  6:08     ` Juergen Gross
2016-01-07 10:12       ` Ian Campbell
2015-12-18 13:14 ` [PATCH v2 03/13] libxl: provide a function to retrieve the xenstore domain id Juergen Gross
2015-12-18 13:53   ` Andrew Cooper
2015-12-18 14:10     ` Juergen Gross
2016-01-06 15:59       ` Ian Campbell
2016-01-06 16:38         ` Ian Jackson
2016-01-07  5:37         ` Juergen Gross
2016-01-07 10:11           ` Ian Campbell
2016-01-07 10:44             ` Juergen Gross
2016-01-07 10:55               ` Ian Campbell
2016-01-07 11:21                 ` Juergen Gross
2016-01-07 11:36                   ` Ian Campbell
2016-01-07 13:17                     ` Wei Liu
2016-01-07 12:40           ` Wei Liu
2016-01-07 12:57             ` Juergen Gross
2016-01-07 13:13               ` Wei Liu
2015-12-18 13:14 ` [PATCH v2 04/13] xenstore: move init-xenstore-domain to tools/helpers Juergen Gross
2016-01-06 16:03   ` Ian Campbell
2016-01-07  6:12     ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 05/13] libxl: move xen-init-dom0 " Juergen Gross
2016-01-06 16:12   ` Ian Campbell
2016-01-07  6:15     ` Juergen Gross
2016-01-07 10:12       ` Ian Campbell
2016-01-06 16:28   ` Ian Campbell
2016-01-07  6:39     ` Juergen Gross
2015-12-18 13:14 ` Juergen Gross [this message]
2015-12-18 13:14 ` [PATCH v2 07/13] xenstore: add error messages to init-xenstore-domain Juergen Gross
2015-12-18 13:14 ` [PATCH v2 08/13] xenstore: modify init-xenstore-domain parameter syntax Juergen Gross
2016-01-06 16:21   ` Ian Campbell
2016-01-07  6:34     ` Juergen Gross
2016-01-07 10:23       ` Ian Campbell
2016-01-07 10:28         ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 09/13] xenstore: make use of the "xenstore domain" flag Juergen Gross
2016-01-06 16:23   ` Ian Campbell
2016-01-07  6:36     ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 10/13] xenstore: add init-xenstore-domain parameter to specify cmdline Juergen Gross
2015-12-18 13:14 ` [PATCH v2 11/13] tools: split up xen-init-dom0.c Juergen Gross
2016-01-06 16:26   ` Ian Campbell
2016-01-06 16:33     ` Wei Liu
2016-01-07 10:26       ` Ian Campbell
2015-12-18 13:14 ` [PATCH v2 12/13] xenstore: write xenstore domain data to xenstore Juergen Gross
2016-01-06 16:27   ` Ian Campbell
2015-12-18 13:14 ` [PATCH v2 13/13] tools: don't stop xenstore domain when stopping dom0 Juergen Gross
2015-12-18 14:42   ` Andrew Cooper
2015-12-18 14:53     ` Juergen Gross
2016-01-06 16:33       ` Ian Campbell
2016-01-07  6:52         ` Juergen Gross
2016-01-07 10:34           ` Ian Campbell
2016-01-07 10:45             ` Juergen Gross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450444471-6454-7-git-send-email-jgross@suse.com \
    --to=jgross@suse.com \
    --cc=Ian.Campbell@citrix.com \
    --cc=dgdegra@tycho.nsa.gov \
    --cc=ian.jackson@eu.citrix.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.