Add per domain server features, which are initialized by the supported
features at domain introduction, or by live update from the migration
stream. This requires to add the DOMAIN_DATA record to the migration
stream, but for now it will only contain the feature word.
Advertise the Xenstore features to guests by setting the appropriate
bits in the ring page.
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
tools/xenstored/domain.c | 71 ++++++++++++++++++++++++++++++++++++----
tools/xenstored/domain.h | 3 ++
tools/xenstored/lu.c | 14 ++++++--
tools/xenstored/lu.h | 2 +-
4 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c
index e1d5e8d614..f6d24bc13a 100644
--- a/tools/xenstored/domain.c
+++ b/tools/xenstored/domain.c
@@ -32,6 +32,7 @@
#include "transaction.h"
#include "watch.h"
#include "control.h"
+#include "lu.h"
#include <xenevtchn.h>
#include <xenmanage.h>
@@ -42,6 +43,8 @@
#include <mini-os/xenbus.h>
#endif
+#define XENSTORE_FEATURES XENSTORE_SERVER_FEATURE_ERROR
+
static xenmanage_handle *xm_handle;
xengnttab_handle **xgt_handle;
static evtchn_port_t virq_port;
@@ -115,6 +118,9 @@ struct domain
/* Event channel port */
evtchn_port_t port;
+ /* Server features supported for this domain. */
+ unsigned int features;
+
/* Domain path in store. */
char *path;
@@ -799,6 +805,7 @@ static struct domain *alloc_domain(const void *context, unsigned int domid,
domain->unique_id = unique_id;
domain->generation = generation;
domain->introduced = false;
+ domain->features = XENSTORE_FEATURES;
if (hashtable_add(domhash, &domain->domid, domain)) {
talloc_free(domain);
@@ -992,7 +999,8 @@ void ignore_connection(struct connection *conn, unsigned
int err)
{
trace("CONN %p ignored, reason %u\n", conn, err);
- if (conn->domain && conn->domain->interface)
+ if (conn->domain && conn->domain->interface &&
+ (conn->domain->features & XENSTORE_SERVER_FEATURE_ERROR))
conn->domain->interface->error = err;
conn->is_ignored = true;
@@ -1078,11 +1086,14 @@ int do_introduce(const void *ctx, struct connection
*conn,
domain_conn_reset(domain);
- if (domain->interface != NULL &&
- domain->interface->connection == XENSTORE_RECONNECT) {
- /* Notify the domain that xenstore is available */
- domain->interface->connection = XENSTORE_CONNECTED;
- xenevtchn_notify(xce_handle, domain->port);
+ if (domain->interface != NULL) {
+ domain->interface->server_features = domain->features;
+
+ if (domain->interface->connection == XENSTORE_RECONNECT) {
+ /* Notify the domain that xenstore is available */
+ domain->interface->connection = XENSTORE_CONNECTED;
+ xenevtchn_notify(xce_handle, domain->port);
+ }
}
send_ack(conn, XS_INTRODUCE);
@@ -1849,6 +1860,54 @@ void read_state_connection(const void *ctx, const void
*state)
}
}
+static int dump_state_domain(const void *k, void *v, void *arg)
+{
+ struct domain *domain = v;
+ FILE *fp = arg;
+ struct xs_state_domain sd;
+ struct xs_state_record_header head;
+
+ head.type = XS_STATE_TYPE_DOMAIN;
+ head.length = sizeof(sd);
+ memset(&sd, 0, sizeof(sd));
+ sd.domain_id = domain->domid;
+
+ if (lu_status->version > 1)
+ sd.features = domain->features;
+
+ if (fwrite(&head, sizeof(head), 1, fp) != 1)
+ return 1;
+ if (fwrite(&sd, sizeof(sd), 1, fp) != 1)
+ return 1;
+ if (dump_state_align(fp))
+ return 1;
+
+ return 0;
+}
+
+const char *dump_state_domains(FILE *fp)
+{
+ const char *ret = NULL;
+
+ if (hashtable_iterate(domhash, dump_state_domain, fp))
+ ret = "Dump domain error";
+
+ return ret;
+}
+
+void read_state_domain(const void *ctx, const void *state, unsigned int
version)
+{
+ const struct xs_state_domain *sd = state;
+ struct domain *domain;
+
+ domain = find_domain_struct(sd->domain_id);
+ if (!domain)
+ barf("referenced domain not found");
+
+ if (version > 1)
+ domain->features = sd->features;
+}
+
struct domain_acc {
unsigned int domid;
int nodes;
diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h
index 844ac11510..8bfaca8f90 100644
--- a/tools/xenstored/domain.h
+++ b/tools/xenstored/domain.h
@@ -162,8 +162,11 @@ void wrl_apply_debit_direct(struct connection *conn);
void wrl_apply_debit_trans_commit(struct connection *conn);
const char *dump_state_connections(FILE *fp);
+const char *dump_state_domains(FILE *fp);
void read_state_connection(const void *ctx, const void *state);
+void read_state_domain(const void *ctx, const void *state,
+ unsigned int version);
struct hashtable *domain_check_acc_init(void);
void domain_check_acc_add(const struct node *node, struct hashtable *domains);
diff --git a/tools/xenstored/lu.c b/tools/xenstored/lu.c
index 2c6adecb56..77e0d377c5 100644
--- a/tools/xenstored/lu.c
+++ b/tools/xenstored/lu.c
@@ -21,6 +21,8 @@
#include "lu.h"
#include "watch.h"
+struct live_update *lu_status;
