diff options
author | Richard Jones <rjones@redhat.com> | 2009-11-20 14:10:06 +0000 |
---|---|---|
committer | Richard Jones <rjones@redhat.com> | 2009-11-20 18:03:36 +0000 |
commit | 2d9953097b6d3b71122d444a4550047e97aee009 (patch) | |
tree | 6737890f7e75cc83b635eccf2fb839b5cec3c616 /daemon/daemon.h | |
parent | 8fd7f255d611d2092a244c4a48c6b7b4529e98b1 (diff) | |
download | libguestfs-2d9953097b6d3b71122d444a4550047e97aee009.tar.gz libguestfs-2d9953097b6d3b71122d444a4550047e97aee009.tar.xz libguestfs-2d9953097b6d3b71122d444a4550047e97aee009.zip |
availability: Add optional groups and implement guestfs_available call.
The current groups are defined very conservatively using the
following criteria:
(a) Would be impossible to implement on Windows because of
sheer architectural differences (eg: mknod).
(b) Already optional (augeas, inotify).
(c) Not currently optional but not implemented on older RHEL and
Debian releases (ntfs-3g.probe, scrub, zerofree).
The optional groups I've defined according to these criteria are:
. augeas
. inotify
. linuxfsuuid
. linuxmodules
. linuxxattrs
. lvm2
. mknod
. ntfs3g
. scrub
. selinux
. zerofree
(Note that these choices don't prevent us from adding more
optional groups in future. On the other hand to avoid breaking
ABIs we would not wish to change the above groups).
The rest of this large commit is really just implementation:
Each optional function is classified using Optional "group"
flag in the generator.
The daemon has to implement a function
int optgroup_<name>_available (void);
for each optional group. Some of these functions are fixed at
compile time, and some do simple run-time tests.
The do_available implementation in the daemon looks up the correct
function in a table and runs it.
We document the optional groups in the guestfs(3) man page.
Also: I added a NOT_AVAILABLE macro in order to unify all the
existing places where we had a message equivalent to
"function __func__ is not available".
Diffstat (limited to 'daemon/daemon.h')
-rw-r--r-- | daemon/daemon.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/daemon/daemon.h b/daemon/daemon.h index 120c86cc..7ba75990 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -105,6 +105,13 @@ extern guestfs_int_lvm_lv_list *parse_command_line_lvs (void); /*-- in proto.c --*/ extern void main_loop (int sock) __attribute__((noreturn)); +/*-- in optgroups.c (auto-generated) --*/ +struct optgroup { + const char *group; /* Name of the optional group. */ + int (*available) (void); /* Function to test availability. */ +}; +extern struct optgroup optgroups[]; + /* ordinary daemon functions use these to indicate errors */ extern void reply_with_error (const char *fs, ...) __attribute__((format (printf,1,2))); @@ -225,6 +232,16 @@ extern void reply (xdrproc_t xdrp, char *ret); } \ while (0) +/* Marks functions which are not available. + * NB. Cannot be used for FileIn functions. + */ +#define NOT_AVAILABLE(errcode) \ + do { \ + reply_with_error ("%s: function not available", __func__); \ + return (errcode); \ + } \ + while (0) + #ifndef __attribute__ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) # define __attribute__(x) /* empty */ |