X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fguestfs-actions.c;h=d2ec0c760d8d23a7de1af7a8308b8b150af07122;hb=8e570870f577ff0c3db074f88924633b559af5d4;hp=989424d1ab1939d3c86788c306e1658572520877;hpb=843514eef9dc6d04d71e031ba9ddb16e2beb9a04;p=libguestfs.git

diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c
index 989424d..d2ec0c7 100644
--- a/src/guestfs-actions.c
+++ b/src/guestfs-actions.c
@@ -19,6 +19,211 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+struct mount_rv {
+  int cb_done;  /* flag to indicate callback was called */
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mount_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  struct mount_rv *rv = (struct mount_rv *) data;
+
+  if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
+    error (g, "guestfs_mount: failed to parse reply header");
+    return;
+  }
+  if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &rv->err)) {
+      error (g, "guestfs_mount: failed to parse reply error");
+      return;
+    }
+    goto done;
+  }
+ done:
+  rv->cb_done = 1;
+  main_loop.main_loop_quit (g);
+}
+
+int guestfs_mount (guestfs_h *g,
+		const char *device,
+		const char *mountpoint)
+{
+  struct guestfs_mount_args args;
+  struct mount_rv rv;
+  int serial;
+
+  if (g->state != READY) {
+    error (g, "guestfs_mount called from the wrong state, %d != READY",
+      g->state);
+    return -1;
+  }
+
+  memset (&rv, 0, sizeof rv);
+
+  args.device = (char *) device;
+  args.mountpoint = (char *) mountpoint;
+  serial = dispatch (g, GUESTFS_PROC_MOUNT,
+                     (xdrproc_t) xdr_guestfs_mount_args, (char *) &args);
+  if (serial == -1)
+    return -1;
+
+  rv.cb_done = 0;
+  g->reply_cb_internal = mount_cb;
+  g->reply_cb_internal_data = &rv;
+  main_loop.main_loop_run (g);
+  g->reply_cb_internal = NULL;
+  g->reply_cb_internal_data = NULL;
+  if (!rv.cb_done) {
+    error (g, "guestfs_mount failed, see earlier error messages");
+    return -1;
+  }
+
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_MOUNT, serial) == -1)
+    return -1;
+
+  if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", rv.err.error);
+    return -1;
+  }
+
+  return 0;
+}
+
+struct sync_rv {
+  int cb_done;  /* flag to indicate callback was called */
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void sync_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  struct sync_rv *rv = (struct sync_rv *) data;
+
+  if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
+    error (g, "guestfs_sync: failed to parse reply header");
+    return;
+  }
+  if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &rv->err)) {
+      error (g, "guestfs_sync: failed to parse reply error");
+      return;
+    }
+    goto done;
+  }
+ done:
+  rv->cb_done = 1;
+  main_loop.main_loop_quit (g);
+}
+
+int guestfs_sync (guestfs_h *g)
+{
+  struct sync_rv rv;
+  int serial;
+
+  if (g->state != READY) {
+    error (g, "guestfs_sync called from the wrong state, %d != READY",
+      g->state);
+    return -1;
+  }
+
+  memset (&rv, 0, sizeof rv);
+
+  serial = dispatch (g, GUESTFS_PROC_SYNC, NULL, NULL);
+  if (serial == -1)
+    return -1;
+
+  rv.cb_done = 0;
+  g->reply_cb_internal = sync_cb;
+  g->reply_cb_internal_data = &rv;
+  main_loop.main_loop_run (g);
+  g->reply_cb_internal = NULL;
+  g->reply_cb_internal_data = NULL;
+  if (!rv.cb_done) {
+    error (g, "guestfs_sync failed, see earlier error messages");
+    return -1;
+  }
+
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_SYNC, serial) == -1)
+    return -1;
+
+  if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", rv.err.error);
+    return -1;
+  }
+
+  return 0;
+}
+
+struct touch_rv {
+  int cb_done;  /* flag to indicate callback was called */
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void touch_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  struct touch_rv *rv = (struct touch_rv *) data;
+
+  if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
+    error (g, "guestfs_touch: failed to parse reply header");
+    return;
+  }
+  if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &rv->err)) {
+      error (g, "guestfs_touch: failed to parse reply error");
+      return;
+    }
+    goto done;
+  }
+ done:
+  rv->cb_done = 1;
+  main_loop.main_loop_quit (g);
+}
+
+int guestfs_touch (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_touch_args args;
+  struct touch_rv rv;
+  int serial;
+
+  if (g->state != READY) {
+    error (g, "guestfs_touch called from the wrong state, %d != READY",
+      g->state);
+    return -1;
+  }
+
+  memset (&rv, 0, sizeof rv);
+
+  args.path = (char *) path;
+  serial = dispatch (g, GUESTFS_PROC_TOUCH,
+                     (xdrproc_t) xdr_guestfs_touch_args, (char *) &args);
+  if (serial == -1)
+    return -1;
+
+  rv.cb_done = 0;
+  g->reply_cb_internal = touch_cb;
+  g->reply_cb_internal_data = &rv;
+  main_loop.main_loop_run (g);
+  g->reply_cb_internal = NULL;
+  g->reply_cb_internal_data = NULL;
+  if (!rv.cb_done) {
+    error (g, "guestfs_touch failed, see earlier error messages");
+    return -1;
+  }
+
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_TOUCH, serial) == -1)
+    return -1;
+
+  if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", rv.err.error);
+    return -1;
+  }
+
+  return 0;
+}
+
 struct cat_rv {
   int cb_done;  /* flag to indicate callback was called */
   struct guestfs_message_header hdr;
@@ -244,208 +449,149 @@ char **guestfs_ls (guestfs_h *g,
   return rv.ret.listing.listing_val;
 }
 
-struct mount_rv {
+struct list_devices_rv {
   int cb_done;  /* flag to indicate callback was called */
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
+  struct guestfs_list_devices_ret ret;
 };
 
-static void mount_cb (guestfs_h *g, void *data, XDR *xdr)
+static void list_devices_cb (guestfs_h *g, void *data, XDR *xdr)
 {
-  struct mount_rv *rv = (struct mount_rv *) data;
+  struct list_devices_rv *rv = (struct list_devices_rv *) data;
 
   if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
-    error (g, "guestfs_mount: failed to parse reply header");
+    error (g, "guestfs_list_devices: failed to parse reply header");
     return;
   }
   if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
     if (!xdr_guestfs_message_error (xdr, &rv->err)) {
-      error (g, "guestfs_mount: failed to parse reply error");
+      error (g, "guestfs_list_devices: failed to parse reply error");
       return;
     }
     goto done;
   }
- done:
-  rv->cb_done = 1;
-  main_loop.main_loop_quit (g);
-}
-
-int guestfs_mount (guestfs_h *g,
-		const char *device,
-		const char *mountpoint)
-{
-  struct guestfs_mount_args args;
-  struct mount_rv rv;
-  int serial;
-
-  if (g->state != READY) {
-    error (g, "guestfs_mount called from the wrong state, %d != READY",
-      g->state);
-    return -1;
-  }
-
-  memset (&rv, 0, sizeof rv);
-
-  args.device = (char *) device;
-  args.mountpoint = (char *) mountpoint;
-  serial = dispatch (g, GUESTFS_PROC_MOUNT,
-                     (xdrproc_t) xdr_guestfs_mount_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  rv.cb_done = 0;
-  g->reply_cb_internal = mount_cb;
-  g->reply_cb_internal_data = &rv;
-  main_loop.main_loop_run (g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!rv.cb_done) {
-    error (g, "guestfs_mount failed, see earlier error messages");
-    return -1;
-  }
-
-  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_MOUNT, serial) == -1)
-    return -1;
-
-  if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", rv.err.error);
-    return -1;
-  }
-
-  return 0;
-}
-
-struct sync_rv {
-  int cb_done;  /* flag to indicate callback was called */
-  struct guestfs_message_header hdr;
-  struct guestfs_message_error err;
-};
-
-static void sync_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  struct sync_rv *rv = (struct sync_rv *) data;
-
-  if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
-    error (g, "guestfs_sync: failed to parse reply header");
+  if (!xdr_guestfs_list_devices_ret (xdr, &rv->ret)) {
+    error (g, "guestfs_list_devices: failed to parse reply");
     return;
   }
-  if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
-    if (!xdr_guestfs_message_error (xdr, &rv->err)) {
-      error (g, "guestfs_sync: failed to parse reply error");
-      return;
-    }
-    goto done;
-  }
  done:
   rv->cb_done = 1;
   main_loop.main_loop_quit (g);
 }
 
-int guestfs_sync (guestfs_h *g)
+char **guestfs_list_devices (guestfs_h *g)
 {
-  struct sync_rv rv;
+  struct list_devices_rv rv;
   int serial;
 
   if (g->state != READY) {
-    error (g, "guestfs_sync called from the wrong state, %d != READY",
+    error (g, "guestfs_list_devices called from the wrong state, %d != READY",
       g->state);
-    return -1;
+    return NULL;
   }
 
   memset (&rv, 0, sizeof rv);
 
-  serial = dispatch (g, GUESTFS_PROC_SYNC, NULL, NULL);
+  serial = dispatch (g, GUESTFS_PROC_LIST_DEVICES, NULL, NULL);
   if (serial == -1)
-    return -1;
+    return NULL;
 
   rv.cb_done = 0;
-  g->reply_cb_internal = sync_cb;
+  g->reply_cb_internal = list_devices_cb;
   g->reply_cb_internal_data = &rv;
   main_loop.main_loop_run (g);
   g->reply_cb_internal = NULL;
   g->reply_cb_internal_data = NULL;
   if (!rv.cb_done) {
-    error (g, "guestfs_sync failed, see earlier error messages");
-    return -1;
+    error (g, "guestfs_list_devices failed, see earlier error messages");
+    return NULL;
   }
 
-  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_SYNC, serial) == -1)
-    return -1;
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_LIST_DEVICES, serial) == -1)
+    return NULL;
 
   if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", rv.err.error);
-    return -1;
+    return NULL;
   }
 
-  return 0;
+  /* caller will free this, but we need to add a NULL entry */
+  rv.ret.devices.devices_val = safe_realloc (g, rv.ret.devices.devices_val, rv.ret.devices.devices_len + 1);
+  rv.ret.devices.devices_val[rv.ret.devices.devices_len] = NULL;
+  return rv.ret.devices.devices_val;
 }
 
-struct touch_rv {
+struct list_partitions_rv {
   int cb_done;  /* flag to indicate callback was called */
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
+  struct guestfs_list_partitions_ret ret;
 };
 
-static void touch_cb (guestfs_h *g, void *data, XDR *xdr)
+static void list_partitions_cb (guestfs_h *g, void *data, XDR *xdr)
 {
-  struct touch_rv *rv = (struct touch_rv *) data;
+  struct list_partitions_rv *rv = (struct list_partitions_rv *) data;
 
   if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
-    error (g, "guestfs_touch: failed to parse reply header");
+    error (g, "guestfs_list_partitions: failed to parse reply header");
     return;
   }
   if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
     if (!xdr_guestfs_message_error (xdr, &rv->err)) {
-      error (g, "guestfs_touch: failed to parse reply error");
+      error (g, "guestfs_list_partitions: failed to parse reply error");
       return;
     }
     goto done;
   }
+  if (!xdr_guestfs_list_partitions_ret (xdr, &rv->ret)) {
+    error (g, "guestfs_list_partitions: failed to parse reply");
+    return;
+  }
  done:
   rv->cb_done = 1;
   main_loop.main_loop_quit (g);
 }
 
-int guestfs_touch (guestfs_h *g,
-		const char *path)
+char **guestfs_list_partitions (guestfs_h *g)
 {
-  struct guestfs_touch_args args;
-  struct touch_rv rv;
+  struct list_partitions_rv rv;
   int serial;
 
   if (g->state != READY) {
-    error (g, "guestfs_touch called from the wrong state, %d != READY",
+    error (g, "guestfs_list_partitions called from the wrong state, %d != READY",
       g->state);
-    return -1;
+    return NULL;
   }
 
   memset (&rv, 0, sizeof rv);
 
-  args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_TOUCH,
-                     (xdrproc_t) xdr_guestfs_touch_args, (char *) &args);
+  serial = dispatch (g, GUESTFS_PROC_LIST_PARTITIONS, NULL, NULL);
   if (serial == -1)
-    return -1;
+    return NULL;
 
   rv.cb_done = 0;
-  g->reply_cb_internal = touch_cb;
+  g->reply_cb_internal = list_partitions_cb;
   g->reply_cb_internal_data = &rv;
   main_loop.main_loop_run (g);
   g->reply_cb_internal = NULL;
   g->reply_cb_internal_data = NULL;
   if (!rv.cb_done) {
-    error (g, "guestfs_touch failed, see earlier error messages");
-    return -1;
+    error (g, "guestfs_list_partitions failed, see earlier error messages");
+    return NULL;
   }
 
-  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_TOUCH, serial) == -1)
-    return -1;
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_LIST_PARTITIONS, serial) == -1)
+    return NULL;
 
   if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", rv.err.error);
-    return -1;
+    return NULL;
   }
 
-  return 0;
+  /* caller will free this, but we need to add a NULL entry */
+  rv.ret.partitions.partitions_val = safe_realloc (g, rv.ret.partitions.partitions_val, rv.ret.partitions.partitions_len + 1);
+  rv.ret.partitions.partitions_val[rv.ret.partitions.partitions_len] = NULL;
+  return rv.ret.partitions.partitions_val;
 }