tools/xenstored: split domain_init()

Today domain_init() is called either just before calling dom0_init()
in case no live update is being performed, or it is called after
reading the global state from read_state_global(), as the event
channel fd is needed.

Split up domain_init() into a preparation part which can be called
unconditionally, and in a part setting up the event channel handle.

Note that there is no chance that chk_domain_generation() can be
called now before xc_handle has been setup, so there is no need for
the related special case anymore.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>

diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c
index 9eb3cdf4463b6ed68f886ec310b129a69610297c..3bf2ec7734c81eea833e79ddf805a2374dfeedcb 100644 (file)
--- a/tools/xenstored/core.c
+++ b/tools/xenstored/core.c
@@ -2742,6 +2742,8 @@ int main(int argc, char *argv[])
 
        talloc_enable_null_tracking();
 
+       domain_early_init();
+
        /* Listen to hypervisor. */
        if (!live_update) {
                domain_init(-1);

diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c
index af80a8221ddd0e8b24c2ad8edeac63c2913cbf4a..621b415088b4bb8757e0804147349c549d4bd0d2 100644 (file)
--- a/tools/xenstored/domain.c
+++ b/tools/xenstored/domain.c
@@ -1224,10 +1224,8 @@ static int domeq_fn(const void *key1, const void *key2)
        return *(const unsigned int *)key1 == *(const unsigned int *)key2;
 }
 
-void domain_init(int evtfd)
+void domain_early_init(void)
 {
-       int rc;
-
        /* Start with a random rather low domain count for the hashtable. */
        domhash = create_hashtable(NULL, "domains", domhash_fn, domeq_fn, 0);
        if (!domhash)
@@ -1258,6 +1256,11 @@ void domain_init(int evtfd)
        xengnttab_set_max_grants(*xgt_handle, DOMID_FIRST_RESERVED);
 
        talloc_set_destructor(xgt_handle, close_xgt_handle);
+}
+
+void domain_init(int evtfd)
+{
+       int rc;
 
        if (evtfd < 0)
                xce_handle = xenevtchn_open(NULL, XENEVTCHN_NO_CLOEXEC);
@@ -1291,9 +1294,6 @@ static bool chk_domain_generation(unsigned int domid, uint64_t gen)
 {
        struct domain *d;
 
-       if (!xc_handle && domid == dom0_domid)
-               return true;
-
        d = find_domain_struct(domid);
 
        return d && d->generation <= gen;

diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h
index 7625dca8cdfe8581ea591d542ebbe327e5e286ad..224c4c23e2d3acf51432c9d4a7d0ee7293a74815 100644 (file)
--- a/tools/xenstored/domain.h
+++ b/tools/xenstored/domain.h
@@ -82,6 +82,7 @@ int do_get_domain_path(const void *ctx, struct connection *conn,
 int do_reset_watches(const void *ctx, struct connection *conn,
                     struct buffered_data *in);
 
+void domain_early_init(void);
 void domain_init(int evtfd);
 void dom0_init(void);
 void domain_deinit(void);