diff options
author | Alex Zeffertt <alex.zeffertt@eu.citrix.com> | 2009-01-07 21:07:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 11:30:59 -0500 |
commit | 1107ba885e46964316c083d441d5dd185b6c9e49 (patch) | |
tree | 98cc3f81ad7ff554e10fc263abfb7727a438cc5a /include | |
parent | d8220347da2a0639f5e1919a5af08f49cb37c24f (diff) |
xen: add xenfs to allow usermode <-> Xen interaction
The xenfs filesystem exports various interfaces to usermode. Initially
this exports a file to allow usermode to interact with xenbus/xenstore.
Traditionally this appeared in /proc/xen. Rather than extending procfs,
this patch adds a backward-compat mountpoint on /proc/xen, and provides
a xenfs filesystem which can be mounted there.
Signed-off-by: Alex Zeffertt <alex.zeffertt@eu.citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/magic.h | 1 | ||||
-rw-r--r-- | include/xen/xenbus.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index f7f3fdddbef0..439f6f3cb0c4 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #define EFS_SUPER_MAGIC 0x414A53 | 13 | #define EFS_SUPER_MAGIC 0x414A53 |
14 | #define EXT2_SUPER_MAGIC 0xEF53 | 14 | #define EXT2_SUPER_MAGIC 0xEF53 |
15 | #define EXT3_SUPER_MAGIC 0xEF53 | 15 | #define EXT3_SUPER_MAGIC 0xEF53 |
16 | #define XENFS_SUPER_MAGIC 0xabba1974 | ||
16 | #define EXT4_SUPER_MAGIC 0xEF53 | 17 | #define EXT4_SUPER_MAGIC 0xEF53 |
17 | #define HPFS_SUPER_MAGIC 0xf995e849 | 18 | #define HPFS_SUPER_MAGIC 0xf995e849 |
18 | #define ISOFS_SUPER_MAGIC 0x9660 | 19 | #define ISOFS_SUPER_MAGIC 0x9660 |
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 6369d89c25d5..f87f9614844d 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h | |||
@@ -136,8 +136,6 @@ struct xenbus_transaction | |||
136 | /* Nil transaction ID. */ | 136 | /* Nil transaction ID. */ |
137 | #define XBT_NIL ((struct xenbus_transaction) { 0 }) | 137 | #define XBT_NIL ((struct xenbus_transaction) { 0 }) |
138 | 138 | ||
139 | int __init xenbus_dev_init(void); | ||
140 | |||
141 | char **xenbus_directory(struct xenbus_transaction t, | 139 | char **xenbus_directory(struct xenbus_transaction t, |
142 | const char *dir, const char *node, unsigned int *num); | 140 | const char *dir, const char *node, unsigned int *num); |
143 | void *xenbus_read(struct xenbus_transaction t, | 141 | void *xenbus_read(struct xenbus_transaction t, |