tools/xenstore: remove unused cruft from xenstored_domain.c

domain->remote_port and restore_existing_connections() are useless and
can be removed.

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

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index ab1c7835b8b6c56efd79dc8a1a74e876f19ac6a2..50986f8b292837c9ef67f51f6ca283d183b32ec1 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -2087,9 +2087,6 @@ int main(int argc, char *argv[])
        if (!no_domain_init)
                domain_init();
 
-       /* Restore existing connections. */
-       restore_existing_connections();
-
        if (outputpid) {
                printf("%ld\n", (long)getpid());
                fflush(stdout);

diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c
index 7d348d57f35ffde6fcdc269fce6e1d107a09013f..ed8e83b06b40a6e1b38256f39a8f800166edbe5b 100644 (file)
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -54,10 +54,6 @@ struct domain
        /* Event channel port */
        evtchn_port_t port;
 
-       /* The remote end of the event channel, used only to validate
-          repeated domain introductions. */
-       evtchn_port_t remote_port;
-
        /* Domain path in store. */
        char *path;
 
@@ -382,7 +378,6 @@ static int new_domain(struct domain *domain, int port)
        domain->conn->domain = domain;
        domain->conn->id = domain->domid;
 
-       domain->remote_port = port;
        domain->nbentry = 0;
        domain->nbwatch = 0;
 
@@ -470,7 +465,6 @@ int do_introduce(struct connection *conn, struct buffered_data *in)
                        xenevtchn_unbind(xce_handle, domain->port);
                rc = xenevtchn_bind_interdomain(xce_handle, domid, port);
                domain->port = (rc == -1) ? 0 : rc;
-               domain->remote_port = port;
        }
 
        domain_conn_reset(domain);
@@ -636,11 +630,6 @@ const char *get_implicit_path(const struct connection *conn)
        return conn->domain->path;
 }
 
-/* Restore existing connections. */
-void restore_existing_connections(void)
-{
-}
-
 static int set_dom_perms_default(struct node_perms *perms)
 {
        perms->num = 1;

diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h
index 5e00087206c72d896553474eca862461e68dd9f1..66e0a12654420db32177ec1bbfbc9eff704e80b5 100644 (file)
--- a/tools/xenstore/xenstored_domain.h
+++ b/tools/xenstore/xenstored_domain.h
@@ -47,9 +47,6 @@ void domain_init(void);
 /* Returns the implicit path of a connection (only domains have this) */
 const char *get_implicit_path(const struct connection *conn);
 
-/* Read existing connection information from store. */
-void restore_existing_connections(void);
-
 /* Can connection attached to domain read/write. */
 bool domain_can_read(struct connection *conn);
 bool domain_can_write(struct connection *conn);