[Xen-devel] [PATCH 6/9] xenstore: don't start xenstore domain if already one is active

[Juergen Gross <jgross@xxxxxxxx>]

Don't start a new xenstore domain in case one is already detected to
be running.

Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 tools/xenstore/init-xenstore-domain.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/tools/xenstore/init-xenstore-domain.c 
b/tools/xenstore/init-xenstore-domain.c
index 068887c..0ca7eed 100644
--- a/tools/xenstore/init-xenstore-domain.c
+++ b/tools/xenstore/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;
@@ -201,7 +217,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);
 
-- 
2.6.2


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel