|
 |
8d937d6 |
--- xen-4.9.0-rc1.2/tools/xenstore/xenstored_watch.c.orig 2017-04-12 16:18:57.000000000 +0100
|
|
|
8d937d6 |
+++ xen-4.9.0-rc1.2/tools/xenstore/xenstored_watch.c 2017-04-13 21:17:12.255231094 +0100
|
|
|
8d937d6 |
@@ -166,7 +166,7 @@
|
|
|
c577568 |
/* check if valid event */
|
|
|
c577568 |
} else {
|
|
|
c577568 |
relative = !strstarts(vec[0], "/");
|
|
|
8d937d6 |
- vec[0] = canonicalize(conn, in, vec[0]);
|
|
|
8d937d6 |
+ vec[0] = xenstore_canonicalize(conn, in, vec[0]);
|
|
|
8d937d6 |
if (!vec[0])
|
|
|
8d937d6 |
return ENOMEM;
|
|
|
8d937d6 |
if (!is_valid_nodename(vec[0]))
|
|
|
8d937d6 |
@@ -219,7 +219,7 @@
|
|
|
8d937d6 |
if (get_strings(in, vec, ARRAY_SIZE(vec)) != ARRAY_SIZE(vec))
|
|
|
8d937d6 |
return EINVAL;
|
|
|
8d937d6 |
|
|
|
8d937d6 |
- node = canonicalize(conn, in, vec[0]);
|
|
|
8d937d6 |
+ node = xenstore_canonicalize(conn, in, vec[0]);
|
|
|
8d937d6 |
if (!node)
|
|
|
8d937d6 |
return ENOMEM;
|
|
|
c577568 |
list_for_each_entry(watch, &conn->watches, list) {
|
|
|
8d937d6 |
--- xen-4.9.0-rc1.2/tools/xenstore/xenstored_core.c.orig 2017-04-12 16:18:57.000000000 +0100
|
|
|
8d937d6 |
+++ xen-4.9.0-rc1.2/tools/xenstore/xenstored_core.c 2017-04-13 21:19:35.668429881 +0100
|
|
|
8d937d6 |
@@ -777,7 +777,7 @@
|
|
|
c577568 |
return strings;
|
|
|
c577568 |
}
|
|
|
c577568 |
|
|
|
8d937d6 |
-char *canonicalize(struct connection *conn, const void *ctx, const char *node)
|
|
|
8d937d6 |
+char *xenstore_canonicalize(struct connection *conn, const void *ctx, const char *node)
|
|
|
c577568 |
{
|
|
|
c577568 |
const char *prefix;
|
|
|
c577568 |
|
|
|
8d937d6 |
@@ -799,7 +799,7 @@
|
|
|
c577568 |
|
|
|
8d937d6 |
if (!canonical_name)
|
|
|
8d937d6 |
canonical_name = &tmp_name;
|
|
|
8d937d6 |
- *canonical_name = canonicalize(conn, ctx, name);
|
|
|
8d937d6 |
+ *canonical_name = xenstore_canonicalize(conn, ctx, name);
|
|
|
8d937d6 |
return get_node(conn, ctx, *canonical_name, perm);
|
|
|
8d937d6 |
}
|
|
|
c577568 |
|
|
|
8d937d6 |
--- xen-4.9.0-rc1.2/tools/xenstore/xenstored_core.h.orig 2017-04-12 16:18:57.000000000 +0100
|
|
|
8d937d6 |
+++ xen-4.9.0-rc1.2/tools/xenstore/xenstored_core.h 2017-04-13 21:20:29.146368478 +0100
|
|
|
8d937d6 |
@@ -148,7 +148,7 @@
|
|
|
8d937d6 |
void send_ack(struct connection *conn, enum xsd_sockmsg_type type);
|
|
|
c577568 |
|
|
|
c577568 |
/* Canonicalize this path if possible. */
|
|
|
8d937d6 |
-char *canonicalize(struct connection *conn, const void *ctx, const char *node);
|
|
|
8d937d6 |
+char *xenstore_canonicalize(struct connection *conn, const void *ctx, const char *node);
|
|
|
c577568 |
|
|
|
8d937d6 |
/* Write a node to the tdb data base. */
|
|
|
8d937d6 |
int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node);
|
|
|
c577568 |
--- xen-4.8.0/tools/console/testsuite/console-dom0.c.orig 2016-12-05 12:03:27.000000000 +0000
|
|
|
c577568 |
+++ xen-4.8.0/tools/console/testsuite/console-dom0.c 2017-02-26 21:52:24.554678631 +0000
|
|
|
c577568 |
@@ -18,7 +18,7 @@
|
|
|
c577568 |
}
|
|
|
c577568 |
}
|
|
|
c577568 |
|
|
|
c577568 |
-static void canonicalize(char *buffer)
|
|
|
c577568 |
+static void xenstore_canonicalize(char *buffer)
|
|
|
c577568 |
{
|
|
|
c577568 |
char *reader, *writer;
|
|
|
c577568 |
|
|
|
c577568 |
@@ -51,7 +51,7 @@
|
|
|
c577568 |
tcsetattr(STDOUT_FILENO, TCSAFLUSH, &term);
|
|
|
c577568 |
|
|
|
c577568 |
while ((line = fgets(buffer, sizeof(buffer), stdin))) {
|
|
|
c577568 |
- canonicalize(line);
|
|
|
c577568 |
+ xenstore_canonicalize(line);
|
|
|
c577568 |
|
|
|
c577568 |
if (strcmp(line, "!!!XEN Test Begin!!!\n") == 0) {
|
|
|
c577568 |
break;
|
|
|
c577568 |
@@ -76,7 +76,7 @@
|
|
|
c577568 |
return 1;
|
|
|
c577568 |
}
|
|
|
c577568 |
|
|
|
c577568 |
- canonicalize(line);
|
|
|
c577568 |
+ xenstore_canonicalize(line);
|
|
|
c577568 |
if (strcmp(line, "Seed Okay.\n") != 0) {
|
|
|
c577568 |
fprintf(stderr, "Incorrect seed acknowledgement.\n");
|
|
|
c577568 |
fprintf(stderr, "[%s]", line);
|
|
|
c577568 |
@@ -104,7 +104,7 @@
|
|
|
c577568 |
return 1;
|
|
|
c577568 |
}
|
|
|
c577568 |
|
|
|
c577568 |
- canonicalize(line);
|
|
|
c577568 |
+ xenstore_canonicalize(line);
|
|
|
c577568 |
fprintf(stderr, "%s", line);
|
|
|
c577568 |
} while (strcmp(line, "Okay.\n") != 0);
|
|
|
c577568 |
|
|
|
c577568 |
--- xen-4.8.0/tools/console/testsuite/console-domU.c.orig 2016-12-05 12:03:27.000000000 +0000
|
|
|
c577568 |
+++ xen-4.8.0/tools/console/testsuite/console-domU.c 2017-02-26 21:52:50.320622804 +0000
|
|
|
c577568 |
@@ -6,7 +6,7 @@
|
|
|
c577568 |
#include <termios.h>
|
|
|
c577568 |
#include <unistd.h>
|
|
|
c577568 |
|
|
|
c577568 |
-static void canonicalize(char *buffer)
|
|
|
c577568 |
+static void xenstore_canonicalize(char *buffer)
|
|
|
c577568 |
{
|
|
|
c577568 |
char *reader, *writer;
|
|
|
c577568 |
|
|
|
c577568 |
@@ -45,7 +45,7 @@
|
|
|
c577568 |
return 1;
|
|
|
c577568 |
}
|
|
|
c577568 |
|
|
|
c577568 |
- canonicalize(line);
|
|
|
c577568 |
+ xenstore_canonicalize(line);
|
|
|
c577568 |
seed = strtoul(line, 0, 0);
|
|
|
c577568 |
|
|
|
c577568 |
printf("Seed Okay.\n"); fflush(stdout);
|