aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap/lib
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-07-11 15:36:40 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-07-11 15:36:40 +0100
commit962649c3691e1479ee822ee0314afe4e9f186c5c (patch)
tree0baeb7edfa5651563d6ab5977a0eecb9d5f4e46f /tools/blktap/lib
parent0373c0538d66ef68bf916eaa03f10a78391e7ddb (diff)
downloadxen-962649c3691e1479ee822ee0314afe4e9f186c5c.tar.gz
xen-962649c3691e1479ee822ee0314afe4e9f186c5c.tar.bz2
xen-962649c3691e1479ee822ee0314afe4e9f186c5c.zip
blktap: cleanup
Make functions w/o a prototype static and remove redundant declaration of xs_fire_next_watch(). Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'tools/blktap/lib')
-rw-r--r--tools/blktap/lib/blktaplib.h1
-rw-r--r--tools/blktap/lib/xenbus.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h
index 58a6fd897a..5511bf2f08 100644
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -213,7 +213,6 @@ typedef struct msg_pid {
/* xenstore/xenbus: */
#define DOMNAME "Domain-0"
int setup_probe_watch(struct xs_handle *h);
-int xs_fire_next_watch(struct xs_handle *h);
/* Abitrary values, must match the underlying driver... */
diff --git a/tools/blktap/lib/xenbus.c b/tools/blktap/lib/xenbus.c
index cf6b841618..4fc56d661b 100644
--- a/tools/blktap/lib/xenbus.c
+++ b/tools/blktap/lib/xenbus.c
@@ -354,7 +354,7 @@ static void ueblktap_probe(struct xs_handle *h, struct xenbus_watch *w,
*are created, we initalise the state and attach a disk.
*/
-int add_blockdevice_probe_watch(struct xs_handle *h, const char *domid)
+static int add_blockdevice_probe_watch(struct xs_handle *h, const char *domid)
{
char *path;
struct xenbus_watch *vbd_watch;
@@ -377,7 +377,7 @@ int add_blockdevice_probe_watch(struct xs_handle *h, const char *domid)
}
/* Asynch callback to check for /local/domain/<DOMID>/name */
-void check_dom(struct xs_handle *h, struct xenbus_watch *w,
+static void check_dom(struct xs_handle *h, struct xenbus_watch *w,
const char *bepath_im)
{
char *domid;
@@ -392,7 +392,7 @@ void check_dom(struct xs_handle *h, struct xenbus_watch *w,
}
/* We must wait for xend to register /local/domain/<DOMID> */
-int watch_for_domid(struct xs_handle *h)
+static int watch_for_domid(struct xs_handle *h)
{
struct xenbus_watch *domid_watch;
char *path = NULL;