X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=da991b1763357916916768b294ccaa2f020f4f30;hb=d2636b0984830d950423dadd936114ff242c4a00;hp=6e9788a32427cb7532a179b31929b0d981ad07e1;hpb=9ff99418361cd1b56b00e4ffef52444021e60c72;p=libguestfs.git diff --git a/daemon/daemon.h b/daemon/daemon.h index 6e9788a..da991b1 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -81,8 +81,8 @@ extern int prog_exists (const char *prog); extern void udev_settle (void); -/* This just stops gcc from giving a warning about our custom - * printf formatters %Q and %R. See HACKING file for more +/* This just stops gcc from giving a warning about our custom printf + * formatters %Q and %R. See guestfs(3)/EXTENDING LIBGUESTFS for more * info about these. */ static inline int @@ -103,9 +103,11 @@ extern const char *function_names[]; /*-- in proto.c --*/ extern int proc_nr; extern int serial; +extern uint64_t progress_hint; +extern uint64_t optargs_bitmask; /*-- in mount.c --*/ -extern int root_mounted; +extern int is_root_mounted (void); /*-- in stubs.c (auto-generated) --*/ extern void dispatch_incoming_message (XDR *); @@ -176,7 +178,7 @@ extern void notify_progress (uint64_t position, uint64_t total); */ #define NEED_ROOT(cancel_stmt,fail_stmt) \ do { \ - if (!root_mounted) { \ + if (!is_root_mounted ()) { \ if ((cancel_stmt) != -2) \ reply_with_error ("%s: you must call 'mount' first to mount the root filesystem", __func__); \ fail_stmt; \