summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/guestfs-actions.c252
-rw-r--r--src/guestfs-actions.h3
-rw-r--r--src/guestfs_protocol.c42
-rw-r--r--src/guestfs_protocol.h32
-rw-r--r--src/guestfs_protocol.x21
5 files changed, 349 insertions, 1 deletions
diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c
index efc556ea..ae8afcfc 100644
--- a/src/guestfs-actions.c
+++ b/src/guestfs-actions.c
@@ -6137,3 +6137,255 @@ int guestfs_tgz_out (guestfs_h *g,
return 0;
}
+struct mount_ro_ctx {
+ /* This flag is set by the callbacks, so we know we've done
+ * the callbacks as expected, and in the right sequence.
+ * 0 = not called, 1 = send called,
+ * 1001 = reply called.
+ */
+ int cb_sequence;
+ struct guestfs_message_header hdr;
+ struct guestfs_message_error err;
+};
+
+static void mount_ro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+ guestfs_main_loop *ml = guestfs_get_main_loop (g);
+ struct mount_ro_ctx *ctx = (struct mount_ro_ctx *) data;
+
+ ml->main_loop_quit (ml, g);
+
+ if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+ error (g, "%s: failed to parse reply header", "guestfs_mount_ro");
+ return;
+ }
+ if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+ if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+ error (g, "%s: failed to parse reply error", "guestfs_mount_ro");
+ return;
+ }
+ goto done;
+ }
+ done:
+ ctx->cb_sequence = 1001;
+}
+
+int guestfs_mount_ro (guestfs_h *g,
+ const char *device,
+ const char *mountpoint)
+{
+ struct guestfs_mount_ro_args args;
+ struct mount_ro_ctx ctx;
+ guestfs_main_loop *ml = guestfs_get_main_loop (g);
+ int serial;
+
+ if (check_state (g, "guestfs_mount_ro") == -1) return -1;
+ guestfs_set_busy (g);
+
+ memset (&ctx, 0, sizeof ctx);
+
+ args.device = (char *) device;
+ args.mountpoint = (char *) mountpoint;
+ serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_RO,
+ (xdrproc_t) xdr_guestfs_mount_ro_args, (char *) &args);
+ if (serial == -1) {
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ guestfs__switch_to_receiving (g);
+ ctx.cb_sequence = 0;
+ guestfs_set_reply_callback (g, mount_ro_reply_cb, &ctx);
+ (void) ml->main_loop_run (ml, g);
+ guestfs_set_reply_callback (g, NULL, NULL);
+ if (ctx.cb_sequence != 1001) {
+ error (g, "%s reply failed, see earlier error messages", "guestfs_mount_ro");
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_RO, serial) == -1) {
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+ error (g, "%s", ctx.err.error_message);
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ guestfs_set_ready (g);
+ return 0;
+}
+
+struct mount_options_ctx {
+ /* This flag is set by the callbacks, so we know we've done
+ * the callbacks as expected, and in the right sequence.
+ * 0 = not called, 1 = send called,
+ * 1001 = reply called.
+ */
+ int cb_sequence;
+ struct guestfs_message_header hdr;
+ struct guestfs_message_error err;
+};
+
+static void mount_options_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+ guestfs_main_loop *ml = guestfs_get_main_loop (g);
+ struct mount_options_ctx *ctx = (struct mount_options_ctx *) data;
+
+ ml->main_loop_quit (ml, g);
+
+ if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+ error (g, "%s: failed to parse reply header", "guestfs_mount_options");
+ return;
+ }
+ if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+ if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+ error (g, "%s: failed to parse reply error", "guestfs_mount_options");
+ return;
+ }
+ goto done;
+ }
+ done:
+ ctx->cb_sequence = 1001;
+}
+
+int guestfs_mount_options (guestfs_h *g,
+ const char *options,
+ const char *device,
+ const char *mountpoint)
+{
+ struct guestfs_mount_options_args args;
+ struct mount_options_ctx ctx;
+ guestfs_main_loop *ml = guestfs_get_main_loop (g);
+ int serial;
+
+ if (check_state (g, "guestfs_mount_options") == -1) return -1;
+ guestfs_set_busy (g);
+
+ memset (&ctx, 0, sizeof ctx);
+
+ args.options = (char *) options;
+ args.device = (char *) device;
+ args.mountpoint = (char *) mountpoint;
+ serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_OPTIONS,
+ (xdrproc_t) xdr_guestfs_mount_options_args, (char *) &args);
+ if (serial == -1) {
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ guestfs__switch_to_receiving (g);
+ ctx.cb_sequence = 0;
+ guestfs_set_reply_callback (g, mount_options_reply_cb, &ctx);
+ (void) ml->main_loop_run (ml, g);
+ guestfs_set_reply_callback (g, NULL, NULL);
+ if (ctx.cb_sequence != 1001) {
+ error (g, "%s reply failed, see earlier error messages", "guestfs_mount_options");
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_OPTIONS, serial) == -1) {
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+ error (g, "%s", ctx.err.error_message);
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ guestfs_set_ready (g);
+ return 0;
+}
+
+struct mount_vfs_ctx {
+ /* This flag is set by the callbacks, so we know we've done
+ * the callbacks as expected, and in the right sequence.
+ * 0 = not called, 1 = send called,
+ * 1001 = reply called.
+ */
+ int cb_sequence;
+ struct guestfs_message_header hdr;
+ struct guestfs_message_error err;
+};
+
+static void mount_vfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+ guestfs_main_loop *ml = guestfs_get_main_loop (g);
+ struct mount_vfs_ctx *ctx = (struct mount_vfs_ctx *) data;
+
+ ml->main_loop_quit (ml, g);
+
+ if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+ error (g, "%s: failed to parse reply header", "guestfs_mount_vfs");
+ return;
+ }
+ if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+ if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+ error (g, "%s: failed to parse reply error", "guestfs_mount_vfs");
+ return;
+ }
+ goto done;
+ }
+ done:
+ ctx->cb_sequence = 1001;
+}
+
+int guestfs_mount_vfs (guestfs_h *g,
+ const char *options,
+ const char *vfstype,
+ const char *device,
+ const char *mountpoint)
+{
+ struct guestfs_mount_vfs_args args;
+ struct mount_vfs_ctx ctx;
+ guestfs_main_loop *ml = guestfs_get_main_loop (g);
+ int serial;
+
+ if (check_state (g, "guestfs_mount_vfs") == -1) return -1;
+ guestfs_set_busy (g);
+
+ memset (&ctx, 0, sizeof ctx);
+
+ args.options = (char *) options;
+ args.vfstype = (char *) vfstype;
+ args.device = (char *) device;
+ args.mountpoint = (char *) mountpoint;
+ serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_VFS,
+ (xdrproc_t) xdr_guestfs_mount_vfs_args, (char *) &args);
+ if (serial == -1) {
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ guestfs__switch_to_receiving (g);
+ ctx.cb_sequence = 0;
+ guestfs_set_reply_callback (g, mount_vfs_reply_cb, &ctx);
+ (void) ml->main_loop_run (ml, g);
+ guestfs_set_reply_callback (g, NULL, NULL);
+ if (ctx.cb_sequence != 1001) {
+ error (g, "%s reply failed, see earlier error messages", "guestfs_mount_vfs");
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_VFS, serial) == -1) {
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+ error (g, "%s", ctx.err.error_message);
+ guestfs_set_ready (g);
+ return -1;
+ }
+
+ guestfs_set_ready (g);
+ return 0;
+}
+
diff --git a/src/guestfs-actions.h b/src/guestfs-actions.h
index 68184bad..756b678f 100644
--- a/src/guestfs-actions.h
+++ b/src/guestfs-actions.h
@@ -112,3 +112,6 @@ extern int guestfs_tar_in (guestfs_h *handle, const char *tarfile, const char *d
extern int guestfs_tar_out (guestfs_h *handle, const char *directory, const char *tarfile);
extern int guestfs_tgz_in (guestfs_h *handle, const char *tarball, const char *directory);
extern int guestfs_tgz_out (guestfs_h *handle, const char *directory, const char *tarball);
+extern int guestfs_mount_ro (guestfs_h *handle, const char *device, const char *mountpoint);
+extern int guestfs_mount_options (guestfs_h *handle, const char *options, const char *device, const char *mountpoint);
+extern int guestfs_mount_vfs (guestfs_h *handle, const char *options, const char *vfstype, const char *device, const char *mountpoint);
diff --git a/src/guestfs_protocol.c b/src/guestfs_protocol.c
index 8b88ad95..65eb5fca 100644
--- a/src/guestfs_protocol.c
+++ b/src/guestfs_protocol.c
@@ -1269,6 +1269,48 @@ xdr_guestfs_tgz_out_args (XDR *xdrs, guestfs_tgz_out_args *objp)
}
bool_t
+xdr_guestfs_mount_ro_args (XDR *xdrs, guestfs_mount_ro_args *objp)
+{
+ register int32_t *buf;
+
+ if (!xdr_string (xdrs, &objp->device, ~0))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->mountpoint, ~0))
+ return FALSE;
+ return TRUE;
+}
+
+bool_t
+xdr_guestfs_mount_options_args (XDR *xdrs, guestfs_mount_options_args *objp)
+{
+ register int32_t *buf;
+
+ if (!xdr_string (xdrs, &objp->options, ~0))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->device, ~0))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->mountpoint, ~0))
+ return FALSE;
+ return TRUE;
+}
+
+bool_t
+xdr_guestfs_mount_vfs_args (XDR *xdrs, guestfs_mount_vfs_args *objp)
+{
+ register int32_t *buf;
+
+ if (!xdr_string (xdrs, &objp->options, ~0))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->vfstype, ~0))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->device, ~0))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->mountpoint, ~0))
+ return FALSE;
+ return TRUE;
+}
+
+bool_t
xdr_guestfs_procedure (XDR *xdrs, guestfs_procedure *objp)
{
register int32_t *buf;
diff --git a/src/guestfs_protocol.h b/src/guestfs_protocol.h
index 55e6241e..8803b3d7 100644
--- a/src/guestfs_protocol.h
+++ b/src/guestfs_protocol.h
@@ -657,6 +657,27 @@ struct guestfs_tgz_out_args {
};
typedef struct guestfs_tgz_out_args guestfs_tgz_out_args;
+struct guestfs_mount_ro_args {
+ char *device;
+ char *mountpoint;
+};
+typedef struct guestfs_mount_ro_args guestfs_mount_ro_args;
+
+struct guestfs_mount_options_args {
+ char *options;
+ char *device;
+ char *mountpoint;
+};
+typedef struct guestfs_mount_options_args guestfs_mount_options_args;
+
+struct guestfs_mount_vfs_args {
+ char *options;
+ char *vfstype;
+ char *device;
+ char *mountpoint;
+};
+typedef struct guestfs_mount_vfs_args guestfs_mount_vfs_args;
+
enum guestfs_procedure {
GUESTFS_PROC_MOUNT = 1,
GUESTFS_PROC_SYNC = 2,
@@ -730,7 +751,10 @@ enum guestfs_procedure {
GUESTFS_PROC_TAR_OUT = 70,
GUESTFS_PROC_TGZ_IN = 71,
GUESTFS_PROC_TGZ_OUT = 72,
- GUESTFS_PROC_NR_PROCS = 72 + 1,
+ GUESTFS_PROC_MOUNT_RO = 73,
+ GUESTFS_PROC_MOUNT_OPTIONS = 74,
+ GUESTFS_PROC_MOUNT_VFS = 75,
+ GUESTFS_PROC_NR_PROCS = 75 + 1,
};
typedef enum guestfs_procedure guestfs_procedure;
#define GUESTFS_MESSAGE_MAX 4194304
@@ -881,6 +905,9 @@ extern bool_t xdr_guestfs_tar_in_args (XDR *, guestfs_tar_in_args*);
extern bool_t xdr_guestfs_tar_out_args (XDR *, guestfs_tar_out_args*);
extern bool_t xdr_guestfs_tgz_in_args (XDR *, guestfs_tgz_in_args*);
extern bool_t xdr_guestfs_tgz_out_args (XDR *, guestfs_tgz_out_args*);
+extern bool_t xdr_guestfs_mount_ro_args (XDR *, guestfs_mount_ro_args*);
+extern bool_t xdr_guestfs_mount_options_args (XDR *, guestfs_mount_options_args*);
+extern bool_t xdr_guestfs_mount_vfs_args (XDR *, guestfs_mount_vfs_args*);
extern bool_t xdr_guestfs_procedure (XDR *, guestfs_procedure*);
extern bool_t xdr_guestfs_message_direction (XDR *, guestfs_message_direction*);
extern bool_t xdr_guestfs_message_status (XDR *, guestfs_message_status*);
@@ -990,6 +1017,9 @@ extern bool_t xdr_guestfs_tar_in_args ();
extern bool_t xdr_guestfs_tar_out_args ();
extern bool_t xdr_guestfs_tgz_in_args ();
extern bool_t xdr_guestfs_tgz_out_args ();
+extern bool_t xdr_guestfs_mount_ro_args ();
+extern bool_t xdr_guestfs_mount_options_args ();
+extern bool_t xdr_guestfs_mount_vfs_args ();
extern bool_t xdr_guestfs_procedure ();
extern bool_t xdr_guestfs_message_direction ();
extern bool_t xdr_guestfs_message_status ();
diff --git a/src/guestfs_protocol.x b/src/guestfs_protocol.x
index 7f982693..3cf4df34 100644
--- a/src/guestfs_protocol.x
+++ b/src/guestfs_protocol.x
@@ -508,6 +508,24 @@ struct guestfs_tgz_out_args {
string directory<>;
};
+struct guestfs_mount_ro_args {
+ string device<>;
+ string mountpoint<>;
+};
+
+struct guestfs_mount_options_args {
+ string options<>;
+ string device<>;
+ string mountpoint<>;
+};
+
+struct guestfs_mount_vfs_args {
+ string options<>;
+ string vfstype<>;
+ string device<>;
+ string mountpoint<>;
+};
+
enum guestfs_procedure {
GUESTFS_PROC_MOUNT = 1,
GUESTFS_PROC_SYNC = 2,
@@ -581,6 +599,9 @@ enum guestfs_procedure {
GUESTFS_PROC_TAR_OUT = 70,
GUESTFS_PROC_TGZ_IN = 71,
GUESTFS_PROC_TGZ_OUT = 72,
+ GUESTFS_PROC_MOUNT_RO = 73,
+ GUESTFS_PROC_MOUNT_OPTIONS = 74,
+ GUESTFS_PROC_MOUNT_VFS = 75,
GUESTFS_PROC_NR_PROCS
};