Module Name: src
Committed By: jdolecek
Date: Tue Apr 7 13:38:50 UTC 2020
Modified Files:
src/sys/arch/xen/include: xenbus.h
src/sys/arch/xen/xenbus: xenbus_client.c
Log Message:
make xenbus_watch_path() static, it's not used outside xenbus_client.c
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/include/xenbus.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/xenbus/xenbus_client.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/include/xenbus.h
diff -u src/sys/arch/xen/include/xenbus.h:1.17 src/sys/arch/xen/include/xenbus.h:1.18
--- src/sys/arch/xen/include/xenbus.h:1.17 Tue Apr 7 13:36:22 2020
+++ src/sys/arch/xen/include/xenbus.h Tue Apr 7 13:38:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus.h,v 1.17 2020/04/07 13:36:22 jdolecek Exp $ */
+/* $NetBSD: xenbus.h,v 1.18 2020/04/07 13:38:50 jdolecek Exp $ */
/******************************************************************************
* xenbus.h
*
@@ -167,20 +167,6 @@ int xenbus_free_device(struct xenbus_dev
/**
- * Register a watch on the given path, using the given xenbus_watch structure
- * for storage, and the given callback function as the callback. Return 0 on
- * success, or -errno on error. On success, the given path will be saved as
- * watch->node, and remains the caller's to free. On error, watch->node will
- * be NULL, the device will switch to XenbusStateClosing, and the error will
- * be saved in the store.
- */
-int xenbus_watch_path(struct xenbus_device *dev, char *path,
- struct xenbus_watch *watch,
- void (*callback)(struct xenbus_watch *,
- const char **, unsigned int));
-
-
-/**
* Register a watch on the given path/path2, using the given xenbus_watch
* structure for storage, and the given callback function as the callback.
* Return 0 on success, or -errno on error. On success, the watched path
Index: src/sys/arch/xen/xenbus/xenbus_client.c
diff -u src/sys/arch/xen/xenbus/xenbus_client.c:1.14 src/sys/arch/xen/xenbus/xenbus_client.c:1.15
--- src/sys/arch/xen/xenbus/xenbus_client.c:1.14 Sun Nov 10 21:16:34 2019
+++ src/sys/arch/xen/xenbus/xenbus_client.c Tue Apr 7 13:38:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_client.c,v 1.14 2019/11/10 21:16:34 chs Exp $ */
+/* $NetBSD: xenbus_client.c,v 1.15 2020/04/07 13:38:50 jdolecek Exp $ */
/******************************************************************************
* Client-facing interface for the Xenbus driver. In other words, the
* interface between the Xenbus and the device-specific code, be it the
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_client.c,v 1.14 2019/11/10 21:16:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_client.c,v 1.15 2020/04/07 13:38:50 jdolecek Exp $");
#if 0
#define DPRINTK(fmt, args...) \
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: xenbus_clien
#include <xen/granttables.h>
-int
+static int
xenbus_watch_path(struct xenbus_device *dev, char *path,
struct xenbus_watch *watch,
void (*callback)(struct xenbus_watch *,
