git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
xen
/
xenbus.h
diff --git
a/include/xen/xenbus.h
b/include/xen/xenbus.h
index
f65dc9b
..
8e259ce
100644
(file)
--- a/
include/xen/xenbus.h
+++ b/
include/xen/xenbus.h
@@
-37,6
+37,7
@@
#include <linux/device.h>
#include <linux/notifier.h>
#include <linux/mutex.h>
#include <linux/device.h>
#include <linux/notifier.h>
#include <linux/mutex.h>
+#include <linux/completion.h>
#include <xen/interface/xen.h>
#include <xen/interface/grant_table.h>
#include <xen/interface/io/xenbus.h>
#include <xen/interface/xen.h>
#include <xen/interface/grant_table.h>
#include <xen/interface/io/xenbus.h>
@@
-74,6
+75,7
@@
struct xenbus_device {
struct xenbus_watch otherend_watch;
struct device dev;
enum xenbus_state state;
struct xenbus_watch otherend_watch;
struct device dev;
enum xenbus_state state;
+ struct completion down;
};
static inline struct xenbus_device *to_xenbus_device(struct device *dev)
};
static inline struct xenbus_device *to_xenbus_device(struct device *dev)
@@
-274,7
+276,7
@@
int xenbus_free_evtchn(struct xenbus_device *dev, int port);
/**
* Return the state of the driver rooted at the given store path, or
/**
* Return the state of the driver rooted at the given store path, or
- * XenbusState
Closed
if no state can be read.
+ * XenbusState
Unknown
if no state can be read.
*/
enum xenbus_state xenbus_read_driver_state(const char *path);
*/
enum xenbus_state xenbus_read_driver_state(const char *path);
@@
-295,5
+297,10
@@
void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt,
void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
...);
void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
...);
+int __init xenbus_dev_init(void);
+
+char *xenbus_strstate(enum xenbus_state state);
+int xenbus_dev_is_online(struct xenbus_device *dev);
+int xenbus_frontend_closed(struct xenbus_device *dev);
#endif /* _XEN_XENBUS_H */
#endif /* _XEN_XENBUS_H */