X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-actions.c;h=44d7e1edf4b9860621b6916fddea6ee6971a1270;hp=83f5ec15b99ef6dd1f279f0a81347b09b740fcf3;hb=f4299f7ea55c4bbc9302e102d2fc801829e75ef6;hpb=73d6932ab2dd3f9120a1f4a532621c07cb174705

diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c
index 83f5ec1..44d7e1e 100644
--- a/src/guestfs-actions.c
+++ b/src/guestfs-actions.c
@@ -444,7 +444,8 @@ char **guestfs_ls (guestfs_h *g,
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  rv.ret.listing.listing_val = safe_realloc (g, rv.ret.listing.listing_val, rv.ret.listing.listing_len + 1);
+  rv.ret.listing.listing_val =    safe_realloc (g, rv.ret.listing.listing_val,
+                  sizeof (char *) * (rv.ret.listing.listing_len + 1));
   rv.ret.listing.listing_val[rv.ret.listing.listing_len] = NULL;
   return rv.ret.listing.listing_val;
 }
@@ -517,7 +518,8 @@ char **guestfs_list_devices (guestfs_h *g)
   }
 
   /* 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 =    safe_realloc (g, rv.ret.devices.devices_val,
+                  sizeof (char *) * (rv.ret.devices.devices_len + 1));
   rv.ret.devices.devices_val[rv.ret.devices.devices_len] = NULL;
   return rv.ret.devices.devices_val;
 }
@@ -590,7 +592,8 @@ char **guestfs_list_partitions (guestfs_h *g)
   }
 
   /* 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 =    safe_realloc (g, rv.ret.partitions.partitions_val,
+                  sizeof (char *) * (rv.ret.partitions.partitions_len + 1));
   rv.ret.partitions.partitions_val[rv.ret.partitions.partitions_len] = NULL;
   return rv.ret.partitions.partitions_val;
 }
@@ -626,7 +629,7 @@ static void pvs_cb (guestfs_h *g, void *data, XDR *xdr)
   main_loop.main_loop_quit (g);
 }
 
-struct guestfs_lvm_pv_list *guestfs_pvs (guestfs_h *g)
+char **guestfs_pvs (guestfs_h *g)
 {
   struct pvs_rv rv;
   int serial;
@@ -662,8 +665,11 @@ struct guestfs_lvm_pv_list *guestfs_pvs (guestfs_h *g)
     return NULL;
   }
 
-  /* caller will free this */
-  return safe_memdup (g, &rv.ret.physvols, sizeof (rv.ret.physvols));
+  /* caller will free this, but we need to add a NULL entry */
+  rv.ret.physvols.physvols_val =    safe_realloc (g, rv.ret.physvols.physvols_val,
+                  sizeof (char *) * (rv.ret.physvols.physvols_len + 1));
+  rv.ret.physvols.physvols_val[rv.ret.physvols.physvols_len] = NULL;
+  return rv.ret.physvols.physvols_val;
 }
 
 struct vgs_rv {
@@ -697,7 +703,7 @@ static void vgs_cb (guestfs_h *g, void *data, XDR *xdr)
   main_loop.main_loop_quit (g);
 }
 
-struct guestfs_lvm_vg_list *guestfs_vgs (guestfs_h *g)
+char **guestfs_vgs (guestfs_h *g)
 {
   struct vgs_rv rv;
   int serial;
@@ -733,8 +739,11 @@ struct guestfs_lvm_vg_list *guestfs_vgs (guestfs_h *g)
     return NULL;
   }
 
-  /* caller will free this */
-  return safe_memdup (g, &rv.ret.volgroups, sizeof (rv.ret.volgroups));
+  /* caller will free this, but we need to add a NULL entry */
+  rv.ret.volgroups.volgroups_val =    safe_realloc (g, rv.ret.volgroups.volgroups_val,
+                  sizeof (char *) * (rv.ret.volgroups.volgroups_len + 1));
+  rv.ret.volgroups.volgroups_val[rv.ret.volgroups.volgroups_len] = NULL;
+  return rv.ret.volgroups.volgroups_val;
 }
 
 struct lvs_rv {
@@ -768,7 +777,7 @@ static void lvs_cb (guestfs_h *g, void *data, XDR *xdr)
   main_loop.main_loop_quit (g);
 }
 
-struct guestfs_lvm_lv_list *guestfs_lvs (guestfs_h *g)
+char **guestfs_lvs (guestfs_h *g)
 {
   struct lvs_rv rv;
   int serial;
@@ -804,6 +813,222 @@ struct guestfs_lvm_lv_list *guestfs_lvs (guestfs_h *g)
     return NULL;
   }
 
+  /* caller will free this, but we need to add a NULL entry */
+  rv.ret.logvols.logvols_val =    safe_realloc (g, rv.ret.logvols.logvols_val,
+                  sizeof (char *) * (rv.ret.logvols.logvols_len + 1));
+  rv.ret.logvols.logvols_val[rv.ret.logvols.logvols_len] = NULL;
+  return rv.ret.logvols.logvols_val;
+}
+
+struct pvs_full_rv {
+  int cb_done;  /* flag to indicate callback was called */
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_pvs_full_ret ret;
+};
+
+static void pvs_full_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  struct pvs_full_rv *rv = (struct pvs_full_rv *) data;
+
+  if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
+    error (g, "guestfs_pvs_full: failed to parse reply header");
+    return;
+  }
+  if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &rv->err)) {
+      error (g, "guestfs_pvs_full: failed to parse reply error");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_pvs_full_ret (xdr, &rv->ret)) {
+    error (g, "guestfs_pvs_full: failed to parse reply");
+    return;
+  }
+ done:
+  rv->cb_done = 1;
+  main_loop.main_loop_quit (g);
+}
+
+struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
+{
+  struct pvs_full_rv rv;
+  int serial;
+
+  if (g->state != READY) {
+    error (g, "guestfs_pvs_full called from the wrong state, %d != READY",
+      g->state);
+    return NULL;
+  }
+
+  memset (&rv, 0, sizeof rv);
+
+  serial = dispatch (g, GUESTFS_PROC_PVS_FULL, NULL, NULL);
+  if (serial == -1)
+    return NULL;
+
+  rv.cb_done = 0;
+  g->reply_cb_internal = pvs_full_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_pvs_full failed, see earlier error messages");
+    return NULL;
+  }
+
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_PVS_FULL, serial) == -1)
+    return NULL;
+
+  if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", rv.err.error);
+    return NULL;
+  }
+
+  /* caller will free this */
+  return safe_memdup (g, &rv.ret.physvols, sizeof (rv.ret.physvols));
+}
+
+struct vgs_full_rv {
+  int cb_done;  /* flag to indicate callback was called */
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_vgs_full_ret ret;
+};
+
+static void vgs_full_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  struct vgs_full_rv *rv = (struct vgs_full_rv *) data;
+
+  if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
+    error (g, "guestfs_vgs_full: failed to parse reply header");
+    return;
+  }
+  if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &rv->err)) {
+      error (g, "guestfs_vgs_full: failed to parse reply error");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_vgs_full_ret (xdr, &rv->ret)) {
+    error (g, "guestfs_vgs_full: failed to parse reply");
+    return;
+  }
+ done:
+  rv->cb_done = 1;
+  main_loop.main_loop_quit (g);
+}
+
+struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
+{
+  struct vgs_full_rv rv;
+  int serial;
+
+  if (g->state != READY) {
+    error (g, "guestfs_vgs_full called from the wrong state, %d != READY",
+      g->state);
+    return NULL;
+  }
+
+  memset (&rv, 0, sizeof rv);
+
+  serial = dispatch (g, GUESTFS_PROC_VGS_FULL, NULL, NULL);
+  if (serial == -1)
+    return NULL;
+
+  rv.cb_done = 0;
+  g->reply_cb_internal = vgs_full_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_vgs_full failed, see earlier error messages");
+    return NULL;
+  }
+
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_VGS_FULL, serial) == -1)
+    return NULL;
+
+  if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", rv.err.error);
+    return NULL;
+  }
+
+  /* caller will free this */
+  return safe_memdup (g, &rv.ret.volgroups, sizeof (rv.ret.volgroups));
+}
+
+struct lvs_full_rv {
+  int cb_done;  /* flag to indicate callback was called */
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_lvs_full_ret ret;
+};
+
+static void lvs_full_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  struct lvs_full_rv *rv = (struct lvs_full_rv *) data;
+
+  if (!xdr_guestfs_message_header (xdr, &rv->hdr)) {
+    error (g, "guestfs_lvs_full: failed to parse reply header");
+    return;
+  }
+  if (rv->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &rv->err)) {
+      error (g, "guestfs_lvs_full: failed to parse reply error");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_lvs_full_ret (xdr, &rv->ret)) {
+    error (g, "guestfs_lvs_full: failed to parse reply");
+    return;
+  }
+ done:
+  rv->cb_done = 1;
+  main_loop.main_loop_quit (g);
+}
+
+struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
+{
+  struct lvs_full_rv rv;
+  int serial;
+
+  if (g->state != READY) {
+    error (g, "guestfs_lvs_full called from the wrong state, %d != READY",
+      g->state);
+    return NULL;
+  }
+
+  memset (&rv, 0, sizeof rv);
+
+  serial = dispatch (g, GUESTFS_PROC_LVS_FULL, NULL, NULL);
+  if (serial == -1)
+    return NULL;
+
+  rv.cb_done = 0;
+  g->reply_cb_internal = lvs_full_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_lvs_full failed, see earlier error messages");
+    return NULL;
+  }
+
+  if (check_reply_header (g, &rv.hdr, GUESTFS_PROC_LVS_FULL, serial) == -1)
+    return NULL;
+
+  if (rv.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", rv.err.error);
+    return NULL;
+  }
+
   /* caller will free this */
   return safe_memdup (g, &rv.ret.logvols, sizeof (rv.ret.logvols));
 }