--- xen-4.8.0/tools/xenstore/xenstored_watch.c.orig	2016-12-05 12:03:27.000000000 +0000

+++ xen-4.8.0/tools/xenstore/xenstored_watch.c	2017-02-26 21:48:37.990376356 +0000

@@ -141,7 +141,7 @@

 		/* check if valid event */

 	} else {

 		relative = !strstarts(vec[0], "/");

-		vec[0] = canonicalize(conn, vec[0]);

+		vec[0] = xenstore_canonicalize(conn, vec[0]);

 		if (!is_valid_nodename(vec[0])) {

 			send_error(conn, EINVAL);

 			return;

@@ -192,7 +192,7 @@

 		return;

 	}

-	node = canonicalize(conn, vec[0]);

+	node = xenstore_canonicalize(conn, vec[0]);

 	list_for_each_entry(watch, &conn->watches, list) {

 		if (streq(watch->node, node) && streq(watch->token, vec[1])) {

 			list_del(&watch->list);

--- xen-4.8.0/tools/xenstore/xenstored_core.c.orig	2016-12-05 12:03:27.000000000 +0000

+++ xen-4.8.0/tools/xenstore/xenstored_core.c	2017-02-26 21:49:35.834496009 +0000

@@ -771,7 +771,7 @@

 	return strings;

 }

-char *canonicalize(struct connection *conn, const char *node)

+char *xenstore_canonicalize(struct connection *conn, const char *node)

 {

 	const char *prefix;

@@ -797,7 +797,7 @@

 	struct node *node;

 	const char *name = onearg(in);

-	name = canonicalize(conn, name);

+	name = xenstore_canonicalize(conn, name);

 	node = get_node(conn, in, name, XS_PERM_READ);

 	if (!node) {

 		send_error(conn, errno);

@@ -812,7 +812,7 @@

 	struct node *node;

 	const char *name = onearg(in);

-	name = canonicalize(conn, name);

+	name = xenstore_canonicalize(conn, name);

 	node = get_node(conn, in, name, XS_PERM_READ);

 	if (!node) {

 		send_error(conn, errno);

@@ -949,7 +949,7 @@

 	offset = strlen(vec[0]) + 1;

 	datalen = in->used - offset;

-	name = canonicalize(conn, vec[0]);

+	name = xenstore_canonicalize(conn, vec[0]);

 	node = get_node(conn, in, name, XS_PERM_WRITE);

 	if (!node) {

 		/* No permissions, invalid input? */

@@ -987,7 +987,7 @@

 		return;

 	}

-	name = canonicalize(conn, name);

+	name = xenstore_canonicalize(conn, name);

 	node = get_node(conn, in, name, XS_PERM_WRITE);

 	/* If it already exists, fine. */

@@ -1105,7 +1105,7 @@

 	struct node *node;

 	const char *name = onearg(in);

-	name = canonicalize(conn, name);

+	name = xenstore_canonicalize(conn, name);

 	node = get_node(conn, in, name, XS_PERM_WRITE);

 	if (!node) {

 		/* Didn't exist already?  Fine, if parent exists. */

@@ -1142,7 +1142,7 @@

 	char *strings;

 	unsigned int len;

-	name = canonicalize(conn, name);

+	name = xenstore_canonicalize(conn, name);

 	node = get_node(conn, in, name, XS_PERM_READ);

 	if (!node) {

 		send_error(conn, errno);

@@ -1170,7 +1170,7 @@

 	}

 	/* First arg is node name. */

-	name = canonicalize(conn, in->buffer);

+	name = xenstore_canonicalize(conn, in->buffer);

 	permstr = in->buffer + strlen(in->buffer) + 1;

 	num--;

--- xen-4.8.0/tools/xenstore/xenstored_core.h.orig	2016-12-05 12:03:27.000000000 +0000

+++ xen-4.8.0/tools/xenstore/xenstored_core.h	2017-02-26 21:50:04.480545722 +0000

@@ -142,7 +142,7 @@

 void send_error(struct connection *conn, int error);

 /* Canonicalize this path if possible. */

-char *canonicalize(struct connection *conn, const char *node);

+char *xenstore_canonicalize(struct connection *conn, const char *node);

 /* Check if node is an event node. */

 bool check_event_node(const char *node);

--- xen-4.8.0/tools/console/testsuite/console-dom0.c.orig	2016-12-05 12:03:27.000000000 +0000

+++ xen-4.8.0/tools/console/testsuite/console-dom0.c	2017-02-26 21:52:24.554678631 +0000

@@ -18,7 +18,7 @@

 	}

 }

-static void canonicalize(char *buffer)

+static void xenstore_canonicalize(char *buffer)

 {

 	char *reader, *writer;

@@ -51,7 +51,7 @@

 	tcsetattr(STDOUT_FILENO, TCSAFLUSH, &term);

 	while ((line = fgets(buffer, sizeof(buffer), stdin))) {

-		canonicalize(line);

+		xenstore_canonicalize(line);

 		if (strcmp(line, "!!!XEN Test Begin!!!\n") == 0) {

 			break;

@@ -76,7 +76,7 @@

 		return 1;

 	}

-	canonicalize(line);

+	xenstore_canonicalize(line);

 	if (strcmp(line, "Seed Okay.\n") != 0) {

 		fprintf(stderr, "Incorrect seed acknowledgement.\n");

 		fprintf(stderr, "[%s]", line);

@@ -104,7 +104,7 @@

 				return 1;

 			}

-			canonicalize(line);

+			xenstore_canonicalize(line);

 			fprintf(stderr, "%s", line);

 		} while (strcmp(line, "Okay.\n") != 0);

--- xen-4.8.0/tools/console/testsuite/console-domU.c.orig	2016-12-05 12:03:27.000000000 +0000

+++ xen-4.8.0/tools/console/testsuite/console-domU.c	2017-02-26 21:52:50.320622804 +0000

@@ -6,7 +6,7 @@

 #include <termios.h>

 #include <unistd.h>

-static void canonicalize(char *buffer)

+static void xenstore_canonicalize(char *buffer)

 {

 	char *reader, *writer;

@@ -45,7 +45,7 @@

 		return 1;

 	}

-	canonicalize(line);

+	xenstore_canonicalize(line);

 	seed = strtoul(line, 0, 0);

 	printf("Seed Okay.\n"); fflush(stdout);