X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=perl%2FGuestfs.xs;h=be13fcdeaadb0ed419a29ee0fcc15d337caeebc6;hp=0f72c28221d3c869bf96df8b733c41757c9bd0ec;hb=8f9f02d483b87c787d089cf9329f5f1b81d3a77e;hpb=b4d2a01828e5de85e5eee3631f7fe3925a0312ca

diff --git a/perl/Guestfs.xs b/perl/Guestfs.xs
index 0f72c28..be13fcd 100644
--- a/perl/Guestfs.xs
+++ b/perl/Guestfs.xs
@@ -57,22 +57,6 @@ my_newSVull(unsigned long long val) {
 #endif
 }
 
-/* XXX Not thread-safe, and in general not safe if the caller is
- * issuing multiple requests in parallel (on different guestfs
- * handles).  We should use the guestfs_h handle passed to the
- * error handle to distinguish these cases.
- */
-static char *last_error = NULL;
-
-static void
-error_handler (guestfs_h *g,
-	       void *data,
-	       const char *msg)
-{
-  if (last_error != NULL) free (last_error);
-  last_error = strdup (msg);
-}
-
 /* http://www.perlmonks.org/?node_id=680842 */
 static char **
 XS_unpack_charPtrPtr (SV *arg) {
@@ -90,14 +74,13 @@ XS_unpack_charPtrPtr (SV *arg) {
   for (i = 0; i <= av_len (av); i++) {
     SV **elem = av_fetch (av, i, 0);
 
-      if (!elem || !*elem) {
-        croak ("missing element in list");
-      }
+    if (!elem || !*elem)
+      croak ("missing element in list");
 
-      ret[i] = SvPV_nolen (*elem);
+    ret[i] = SvPV_nolen (*elem);
   }
 
-  ret[i + 1] = NULL;
+  ret[i] = NULL;
 
   return ret;
 }
@@ -110,7 +93,7 @@ _create ()
       RETVAL = guestfs_create ();
       if (!RETVAL)
         croak ("could not create guestfs handle");
-      guestfs_set_error_handler (RETVAL, error_handler, NULL);
+      guestfs_set_error_handler (RETVAL, NULL, NULL);
  OUTPUT:
       RETVAL
 
@@ -123,63 +106,101 @@ DESTROY (g)
 void
 launch (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_launch (g) == -1) {
-        croak ("launch: %s", last_error);
-      }
+      r = guestfs_launch (g);
+      if (r == -1)
+        croak ("launch: %s", guestfs_last_error (g));
 
 void
 wait_ready (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_wait_ready (g) == -1) {
-        croak ("wait_ready: %s", last_error);
-      }
+      r = guestfs_wait_ready (g);
+      if (r == -1)
+        croak ("wait_ready: %s", guestfs_last_error (g));
 
 void
 kill_subprocess (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_kill_subprocess (g) == -1) {
-        croak ("kill_subprocess: %s", last_error);
-      }
+      r = guestfs_kill_subprocess (g);
+      if (r == -1)
+        croak ("kill_subprocess: %s", guestfs_last_error (g));
 
 void
 add_drive (g, filename)
       guestfs_h *g;
       char *filename;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_add_drive (g, filename) == -1) {
-        croak ("add_drive: %s", last_error);
-      }
+      r = guestfs_add_drive (g, filename);
+      if (r == -1)
+        croak ("add_drive: %s", guestfs_last_error (g));
 
 void
 add_cdrom (g, filename)
       guestfs_h *g;
       char *filename;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_add_cdrom (g, filename) == -1) {
-        croak ("add_cdrom: %s", last_error);
-      }
+      r = guestfs_add_cdrom (g, filename);
+      if (r == -1)
+        croak ("add_cdrom: %s", guestfs_last_error (g));
 
 void
 config (g, qemuparam, qemuvalue)
       guestfs_h *g;
       char *qemuparam;
       char *qemuvalue;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_config (g, qemuparam, qemuvalue) == -1) {
-        croak ("config: %s", last_error);
-      }
+      r = guestfs_config (g, qemuparam, qemuvalue);
+      if (r == -1)
+        croak ("config: %s", guestfs_last_error (g));
+
+void
+set_qemu (g, qemu)
+      guestfs_h *g;
+      char *qemu;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_set_qemu (g, qemu);
+      if (r == -1)
+        croak ("set_qemu: %s", guestfs_last_error (g));
+
+SV *
+get_qemu (g)
+      guestfs_h *g;
+PREINIT:
+      const char *qemu;
+   CODE:
+      qemu = guestfs_get_qemu (g);
+      if (qemu == NULL)
+        croak ("get_qemu: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (qemu, 0);
+ OUTPUT:
+      RETVAL
 
 void
 set_path (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_set_path (g, path) == -1) {
-        croak ("set_path: %s", last_error);
-      }
+      r = guestfs_set_path (g, path);
+      if (r == -1)
+        croak ("set_path: %s", guestfs_last_error (g));
 
 SV *
 get_path (g)
@@ -188,9 +209,8 @@ PREINIT:
       const char *path;
    CODE:
       path = guestfs_get_path (g);
-      if (path == NULL) {
-        croak ("get_path: %s", last_error);
-      }
+      if (path == NULL)
+        croak ("get_path: %s", guestfs_last_error (g));
       RETVAL = newSVpv (path, 0);
  OUTPUT:
       RETVAL
@@ -199,10 +219,12 @@ void
 set_autosync (g, autosync)
       guestfs_h *g;
       int autosync;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_set_autosync (g, autosync) == -1) {
-        croak ("set_autosync: %s", last_error);
-      }
+      r = guestfs_set_autosync (g, autosync);
+      if (r == -1)
+        croak ("set_autosync: %s", guestfs_last_error (g));
 
 SV *
 get_autosync (g)
@@ -211,9 +233,8 @@ PREINIT:
       int autosync;
    CODE:
       autosync = guestfs_get_autosync (g);
-      if (autosync == -1) {
-        croak ("get_autosync: %s", last_error);
-      }
+      if (autosync == -1)
+        croak ("get_autosync: %s", guestfs_last_error (g));
       RETVAL = newSViv (autosync);
  OUTPUT:
       RETVAL
@@ -222,10 +243,12 @@ void
 set_verbose (g, verbose)
       guestfs_h *g;
       int verbose;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_set_verbose (g, verbose) == -1) {
-        croak ("set_verbose: %s", last_error);
-      }
+      r = guestfs_set_verbose (g, verbose);
+      if (r == -1)
+        croak ("set_verbose: %s", guestfs_last_error (g));
 
 SV *
 get_verbose (g)
@@ -234,39 +257,129 @@ PREINIT:
       int verbose;
    CODE:
       verbose = guestfs_get_verbose (g);
-      if (verbose == -1) {
-        croak ("get_verbose: %s", last_error);
-      }
+      if (verbose == -1)
+        croak ("get_verbose: %s", guestfs_last_error (g));
       RETVAL = newSViv (verbose);
  OUTPUT:
       RETVAL
 
+SV *
+is_ready (g)
+      guestfs_h *g;
+PREINIT:
+      int ready;
+   CODE:
+      ready = guestfs_is_ready (g);
+      if (ready == -1)
+        croak ("is_ready: %s", guestfs_last_error (g));
+      RETVAL = newSViv (ready);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_config (g)
+      guestfs_h *g;
+PREINIT:
+      int config;
+   CODE:
+      config = guestfs_is_config (g);
+      if (config == -1)
+        croak ("is_config: %s", guestfs_last_error (g));
+      RETVAL = newSViv (config);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_launching (g)
+      guestfs_h *g;
+PREINIT:
+      int launching;
+   CODE:
+      launching = guestfs_is_launching (g);
+      if (launching == -1)
+        croak ("is_launching: %s", guestfs_last_error (g));
+      RETVAL = newSViv (launching);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_busy (g)
+      guestfs_h *g;
+PREINIT:
+      int busy;
+   CODE:
+      busy = guestfs_is_busy (g);
+      if (busy == -1)
+        croak ("is_busy: %s", guestfs_last_error (g));
+      RETVAL = newSViv (busy);
+ OUTPUT:
+      RETVAL
+
+SV *
+get_state (g)
+      guestfs_h *g;
+PREINIT:
+      int state;
+   CODE:
+      state = guestfs_get_state (g);
+      if (state == -1)
+        croak ("get_state: %s", guestfs_last_error (g));
+      RETVAL = newSViv (state);
+ OUTPUT:
+      RETVAL
+
+void
+set_busy (g)
+      guestfs_h *g;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_set_busy (g);
+      if (r == -1)
+        croak ("set_busy: %s", guestfs_last_error (g));
+
+void
+set_ready (g)
+      guestfs_h *g;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_set_ready (g);
+      if (r == -1)
+        croak ("set_ready: %s", guestfs_last_error (g));
+
 void
 mount (g, device, mountpoint)
       guestfs_h *g;
       char *device;
       char *mountpoint;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_mount (g, device, mountpoint) == -1) {
-        croak ("mount: %s", last_error);
-      }
+      r = guestfs_mount (g, device, mountpoint);
+      if (r == -1)
+        croak ("mount: %s", guestfs_last_error (g));
 
 void
 sync (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_sync (g) == -1) {
-        croak ("sync: %s", last_error);
-      }
+      r = guestfs_sync (g);
+      if (r == -1)
+        croak ("sync: %s", guestfs_last_error (g));
 
 void
 touch (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_touch (g, path) == -1) {
-        croak ("touch: %s", last_error);
-      }
+      r = guestfs_touch (g, path);
+      if (r == -1)
+        croak ("touch: %s", guestfs_last_error (g));
 
 SV *
 cat (g, path)
@@ -276,9 +389,8 @@ PREINIT:
       char *content;
    CODE:
       content = guestfs_cat (g, path);
-      if (content == NULL) {
-        croak ("cat: %s", last_error);
-      }
+      if (content == NULL)
+        croak ("cat: %s", guestfs_last_error (g));
       RETVAL = newSVpv (content, 0);
       free (content);
  OUTPUT:
@@ -292,9 +404,8 @@ PREINIT:
       char *listing;
    CODE:
       listing = guestfs_ll (g, directory);
-      if (listing == NULL) {
-        croak ("ll: %s", last_error);
-      }
+      if (listing == NULL)
+        croak ("ll: %s", guestfs_last_error (g));
       RETVAL = newSVpv (listing, 0);
       free (listing);
  OUTPUT:
@@ -309,9 +420,8 @@ PREINIT:
       int i, n;
  PPCODE:
       listing = guestfs_ls (g, directory);
-      if (listing == NULL) {
-        croak ("ls: %s", last_error);
-      }
+      if (listing == NULL)
+        croak ("ls: %s", guestfs_last_error (g));
       for (n = 0; listing[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -328,9 +438,8 @@ PREINIT:
       int i, n;
  PPCODE:
       devices = guestfs_list_devices (g);
-      if (devices == NULL) {
-        croak ("list_devices: %s", last_error);
-      }
+      if (devices == NULL)
+        croak ("list_devices: %s", guestfs_last_error (g));
       for (n = 0; devices[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -347,9 +456,8 @@ PREINIT:
       int i, n;
  PPCODE:
       partitions = guestfs_list_partitions (g);
-      if (partitions == NULL) {
-        croak ("list_partitions: %s", last_error);
-      }
+      if (partitions == NULL)
+        croak ("list_partitions: %s", guestfs_last_error (g));
       for (n = 0; partitions[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -366,9 +474,8 @@ PREINIT:
       int i, n;
  PPCODE:
       physvols = guestfs_pvs (g);
-      if (physvols == NULL) {
-        croak ("pvs: %s", last_error);
-      }
+      if (physvols == NULL)
+        croak ("pvs: %s", guestfs_last_error (g));
       for (n = 0; physvols[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -385,9 +492,8 @@ PREINIT:
       int i, n;
  PPCODE:
       volgroups = guestfs_vgs (g);
-      if (volgroups == NULL) {
-        croak ("vgs: %s", last_error);
-      }
+      if (volgroups == NULL)
+        croak ("vgs: %s", guestfs_last_error (g));
       for (n = 0; volgroups[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -404,9 +510,8 @@ PREINIT:
       int i, n;
  PPCODE:
       logvols = guestfs_lvs (g);
-      if (logvols == NULL) {
-        croak ("lvs: %s", last_error);
-      }
+      if (logvols == NULL)
+        croak ("lvs: %s", guestfs_last_error (g));
       for (n = 0; logvols[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -425,7 +530,7 @@ PREINIT:
  PPCODE:
       physvols = guestfs_pvs_full (g);
       if (physvols == NULL)
-        croak ("pvs_full: %s", last_error);
+        croak ("pvs_full: %s", guestfs_last_error (g));
       EXTEND (SP, physvols->len);
       for (i = 0; i < physvols->len; ++i) {
         hv = newHV ();
@@ -457,7 +562,7 @@ PREINIT:
  PPCODE:
       volgroups = guestfs_vgs_full (g);
       if (volgroups == NULL)
-        croak ("vgs_full: %s", last_error);
+        croak ("vgs_full: %s", guestfs_last_error (g));
       EXTEND (SP, volgroups->len);
       for (i = 0; i < volgroups->len; ++i) {
         hv = newHV ();
@@ -494,7 +599,7 @@ PREINIT:
  PPCODE:
       logvols = guestfs_lvs_full (g);
       if (logvols == NULL)
-        croak ("lvs_full: %s", last_error);
+        croak ("lvs_full: %s", guestfs_last_error (g));
       EXTEND (SP, logvols->len);
       for (i = 0; i < logvols->len; ++i) {
         hv = newHV ();
@@ -527,9 +632,8 @@ PREINIT:
       int i, n;
  PPCODE:
       lines = guestfs_read_lines (g, path);
-      if (lines == NULL) {
-        croak ("read_lines: %s", last_error);
-      }
+      if (lines == NULL)
+        croak ("read_lines: %s", guestfs_last_error (g));
       for (n = 0; lines[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -543,18 +647,22 @@ aug_init (g, root, flags)
       guestfs_h *g;
       char *root;
       int flags;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_aug_init (g, root, flags) == -1) {
-        croak ("aug_init: %s", last_error);
-      }
+      r = guestfs_aug_init (g, root, flags);
+      if (r == -1)
+        croak ("aug_init: %s", guestfs_last_error (g));
 
 void
 aug_close (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_aug_close (g) == -1) {
-        croak ("aug_close: %s", last_error);
-      }
+      r = guestfs_aug_close (g);
+      if (r == -1)
+        croak ("aug_close: %s", guestfs_last_error (g));
 
 SV *
 aug_defvar (g, name, expr)
@@ -565,9 +673,8 @@ PREINIT:
       int nrnodes;
    CODE:
       nrnodes = guestfs_aug_defvar (g, name, expr);
-      if (nrnodes == -1) {
-        croak ("aug_defvar: %s", last_error);
-      }
+      if (nrnodes == -1)
+        croak ("aug_defvar: %s", guestfs_last_error (g));
       RETVAL = newSViv (nrnodes);
  OUTPUT:
       RETVAL
@@ -582,9 +689,8 @@ PREINIT:
       struct guestfs_int_bool *r;
  PPCODE:
       r = guestfs_aug_defnode (g, name, expr, val);
-      if (r == NULL) {
-        croak ("aug_defnode: %s", last_error);
-      }
+      if (r == NULL)
+        croak ("aug_defnode: %s", guestfs_last_error (g));
       EXTEND (SP, 2);
       PUSHs (sv_2mortal (newSViv (r->i)));
       PUSHs (sv_2mortal (newSViv (r->b)));
@@ -598,9 +704,8 @@ PREINIT:
       char *val;
    CODE:
       val = guestfs_aug_get (g, path);
-      if (val == NULL) {
-        croak ("aug_get: %s", last_error);
-      }
+      if (val == NULL)
+        croak ("aug_get: %s", guestfs_last_error (g));
       RETVAL = newSVpv (val, 0);
       free (val);
  OUTPUT:
@@ -611,10 +716,12 @@ aug_set (g, path, val)
       guestfs_h *g;
       char *path;
       char *val;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_aug_set (g, path, val) == -1) {
-        croak ("aug_set: %s", last_error);
-      }
+      r = guestfs_aug_set (g, path, val);
+      if (r == -1)
+        croak ("aug_set: %s", guestfs_last_error (g));
 
 void
 aug_insert (g, path, label, before)
@@ -622,10 +729,12 @@ aug_insert (g, path, label, before)
       char *path;
       char *label;
       int before;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_aug_insert (g, path, label, before) == -1) {
-        croak ("aug_insert: %s", last_error);
-      }
+      r = guestfs_aug_insert (g, path, label, before);
+      if (r == -1)
+        croak ("aug_insert: %s", guestfs_last_error (g));
 
 SV *
 aug_rm (g, path)
@@ -635,9 +744,8 @@ PREINIT:
       int nrnodes;
    CODE:
       nrnodes = guestfs_aug_rm (g, path);
-      if (nrnodes == -1) {
-        croak ("aug_rm: %s", last_error);
-      }
+      if (nrnodes == -1)
+        croak ("aug_rm: %s", guestfs_last_error (g));
       RETVAL = newSViv (nrnodes);
  OUTPUT:
       RETVAL
@@ -647,10 +755,12 @@ aug_mv (g, src, dest)
       guestfs_h *g;
       char *src;
       char *dest;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_aug_mv (g, src, dest) == -1) {
-        croak ("aug_mv: %s", last_error);
-      }
+      r = guestfs_aug_mv (g, src, dest);
+      if (r == -1)
+        croak ("aug_mv: %s", guestfs_last_error (g));
 
 void
 aug_match (g, path)
@@ -661,9 +771,8 @@ PREINIT:
       int i, n;
  PPCODE:
       matches = guestfs_aug_match (g, path);
-      if (matches == NULL) {
-        croak ("aug_match: %s", last_error);
-      }
+      if (matches == NULL)
+        croak ("aug_match: %s", guestfs_last_error (g));
       for (n = 0; matches[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -675,18 +784,22 @@ PREINIT:
 void
 aug_save (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_aug_save (g) == -1) {
-        croak ("aug_save: %s", last_error);
-      }
+      r = guestfs_aug_save (g);
+      if (r == -1)
+        croak ("aug_save: %s", guestfs_last_error (g));
 
 void
 aug_load (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_aug_load (g) == -1) {
-        croak ("aug_load: %s", last_error);
-      }
+      r = guestfs_aug_load (g);
+      if (r == -1)
+        croak ("aug_load: %s", guestfs_last_error (g));
 
 void
 aug_ls (g, path)
@@ -697,9 +810,8 @@ PREINIT:
       int i, n;
  PPCODE:
       matches = guestfs_aug_ls (g, path);
-      if (matches == NULL) {
-        croak ("aug_ls: %s", last_error);
-      }
+      if (matches == NULL)
+        croak ("aug_ls: %s", guestfs_last_error (g));
       for (n = 0; matches[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -712,56 +824,68 @@ void
 rm (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_rm (g, path) == -1) {
-        croak ("rm: %s", last_error);
-      }
+      r = guestfs_rm (g, path);
+      if (r == -1)
+        croak ("rm: %s", guestfs_last_error (g));
 
 void
 rmdir (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_rmdir (g, path) == -1) {
-        croak ("rmdir: %s", last_error);
-      }
+      r = guestfs_rmdir (g, path);
+      if (r == -1)
+        croak ("rmdir: %s", guestfs_last_error (g));
 
 void
 rm_rf (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_rm_rf (g, path) == -1) {
-        croak ("rm_rf: %s", last_error);
-      }
+      r = guestfs_rm_rf (g, path);
+      if (r == -1)
+        croak ("rm_rf: %s", guestfs_last_error (g));
 
 void
 mkdir (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_mkdir (g, path) == -1) {
-        croak ("mkdir: %s", last_error);
-      }
+      r = guestfs_mkdir (g, path);
+      if (r == -1)
+        croak ("mkdir: %s", guestfs_last_error (g));
 
 void
 mkdir_p (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_mkdir_p (g, path) == -1) {
-        croak ("mkdir_p: %s", last_error);
-      }
+      r = guestfs_mkdir_p (g, path);
+      if (r == -1)
+        croak ("mkdir_p: %s", guestfs_last_error (g));
 
 void
 chmod (g, mode, path)
       guestfs_h *g;
       int mode;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_chmod (g, mode, path) == -1) {
-        croak ("chmod: %s", last_error);
-      }
+      r = guestfs_chmod (g, mode, path);
+      if (r == -1)
+        croak ("chmod: %s", guestfs_last_error (g));
 
 void
 chown (g, owner, group, path)
@@ -769,10 +893,12 @@ chown (g, owner, group, path)
       int owner;
       int group;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_chown (g, owner, group, path) == -1) {
-        croak ("chown: %s", last_error);
-      }
+      r = guestfs_chown (g, owner, group, path);
+      if (r == -1)
+        croak ("chown: %s", guestfs_last_error (g));
 
 SV *
 exists (g, path)
@@ -782,9 +908,8 @@ PREINIT:
       int existsflag;
    CODE:
       existsflag = guestfs_exists (g, path);
-      if (existsflag == -1) {
-        croak ("exists: %s", last_error);
-      }
+      if (existsflag == -1)
+        croak ("exists: %s", guestfs_last_error (g));
       RETVAL = newSViv (existsflag);
  OUTPUT:
       RETVAL
@@ -797,9 +922,8 @@ PREINIT:
       int fileflag;
    CODE:
       fileflag = guestfs_is_file (g, path);
-      if (fileflag == -1) {
-        croak ("is_file: %s", last_error);
-      }
+      if (fileflag == -1)
+        croak ("is_file: %s", guestfs_last_error (g));
       RETVAL = newSViv (fileflag);
  OUTPUT:
       RETVAL
@@ -812,9 +936,8 @@ PREINIT:
       int dirflag;
    CODE:
       dirflag = guestfs_is_dir (g, path);
-      if (dirflag == -1) {
-        croak ("is_dir: %s", last_error);
-      }
+      if (dirflag == -1)
+        croak ("is_dir: %s", guestfs_last_error (g));
       RETVAL = newSViv (dirflag);
  OUTPUT:
       RETVAL
@@ -823,22 +946,25 @@ void
 pvcreate (g, device)
       guestfs_h *g;
       char *device;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_pvcreate (g, device) == -1) {
-        croak ("pvcreate: %s", last_error);
-      }
+      r = guestfs_pvcreate (g, device);
+      if (r == -1)
+        croak ("pvcreate: %s", guestfs_last_error (g));
 
 void
 vgcreate (g, volgroup, physvols)
       guestfs_h *g;
       char *volgroup;
       char **physvols;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_vgcreate (g, volgroup, physvols) == -1) {
-        free (physvols);
-        croak ("vgcreate: %s", last_error);
-      }
-        free (physvols);
+      r = guestfs_vgcreate (g, volgroup, physvols);
+      free (physvols);
+      if (r == -1)
+        croak ("vgcreate: %s", guestfs_last_error (g));
 
 void
 lvcreate (g, logvol, volgroup, mbytes)
@@ -846,20 +972,24 @@ lvcreate (g, logvol, volgroup, mbytes)
       char *logvol;
       char *volgroup;
       int mbytes;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_lvcreate (g, logvol, volgroup, mbytes) == -1) {
-        croak ("lvcreate: %s", last_error);
-      }
+      r = guestfs_lvcreate (g, logvol, volgroup, mbytes);
+      if (r == -1)
+        croak ("lvcreate: %s", guestfs_last_error (g));
 
 void
 mkfs (g, fstype, device)
       guestfs_h *g;
       char *fstype;
       char *device;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_mkfs (g, fstype, device) == -1) {
-        croak ("mkfs: %s", last_error);
-      }
+      r = guestfs_mkfs (g, fstype, device);
+      if (r == -1)
+        croak ("mkfs: %s", guestfs_last_error (g));
 
 void
 sfdisk (g, device, cyls, heads, sectors, lines)
@@ -869,12 +999,13 @@ sfdisk (g, device, cyls, heads, sectors, lines)
       int heads;
       int sectors;
       char **lines;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_sfdisk (g, device, cyls, heads, sectors, lines) == -1) {
-        free (lines);
-        croak ("sfdisk: %s", last_error);
-      }
-        free (lines);
+      r = guestfs_sfdisk (g, device, cyls, heads, sectors, lines);
+      free (lines);
+      if (r == -1)
+        croak ("sfdisk: %s", guestfs_last_error (g));
 
 void
 write_file (g, path, content, size)
@@ -882,19 +1013,23 @@ write_file (g, path, content, size)
       char *path;
       char *content;
       int size;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_write_file (g, path, content, size) == -1) {
-        croak ("write_file: %s", last_error);
-      }
+      r = guestfs_write_file (g, path, content, size);
+      if (r == -1)
+        croak ("write_file: %s", guestfs_last_error (g));
 
 void
 umount (g, pathordevice)
       guestfs_h *g;
       char *pathordevice;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_umount (g, pathordevice) == -1) {
-        croak ("umount: %s", last_error);
-      }
+      r = guestfs_umount (g, pathordevice);
+      if (r == -1)
+        croak ("umount: %s", guestfs_last_error (g));
 
 void
 mounts (g)
@@ -904,9 +1039,8 @@ PREINIT:
       int i, n;
  PPCODE:
       devices = guestfs_mounts (g);
-      if (devices == NULL) {
-        croak ("mounts: %s", last_error);
-      }
+      if (devices == NULL)
+        croak ("mounts: %s", guestfs_last_error (g));
       for (n = 0; devices[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -918,16 +1052,436 @@ PREINIT:
 void
 umount_all (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_umount_all (g) == -1) {
-        croak ("umount_all: %s", last_error);
-      }
+      r = guestfs_umount_all (g);
+      if (r == -1)
+        croak ("umount_all: %s", guestfs_last_error (g));
 
 void
 lvm_remove_all (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_lvm_remove_all (g) == -1) {
-        croak ("lvm_remove_all: %s", last_error);
+      r = guestfs_lvm_remove_all (g);
+      if (r == -1)
+        croak ("lvm_remove_all: %s", guestfs_last_error (g));
+
+SV *
+file (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      char *description;
+   CODE:
+      description = guestfs_file (g, path);
+      if (description == NULL)
+        croak ("file: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (description, 0);
+      free (description);
+ OUTPUT:
+      RETVAL
+
+SV *
+command (g, arguments)
+      guestfs_h *g;
+      char **arguments;
+PREINIT:
+      char *output;
+   CODE:
+      output = guestfs_command (g, arguments);
+      free (arguments);
+      if (output == NULL)
+        croak ("command: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (output, 0);
+      free (output);
+ OUTPUT:
+      RETVAL
+
+void
+command_lines (g, arguments)
+      guestfs_h *g;
+      char **arguments;
+PREINIT:
+      char **lines;
+      int i, n;
+ PPCODE:
+      lines = guestfs_command_lines (g, arguments);
+      free (arguments);
+      if (lines == NULL)
+        croak ("command_lines: %s", guestfs_last_error (g));
+      for (n = 0; lines[n] != NULL; ++n) /**/;
+      EXTEND (SP, n);
+      for (i = 0; i < n; ++i) {
+        PUSHs (sv_2mortal (newSVpv (lines[i], 0)));
+        free (lines[i]);
       }
+      free (lines);
+
+void
+stat (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      struct guestfs_stat *statbuf;
+ PPCODE:
+      statbuf = guestfs_stat (g, path);
+      if (statbuf == NULL)
+        croak ("stat: %s", guestfs_last_error (g));
+      EXTEND (SP, 13);
+      PUSHs (sv_2mortal (my_newSVll (statbuf->dev)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->ino)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->mode)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->nlink)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->uid)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->gid)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->rdev)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->size)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->blksize)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->blocks)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->atime)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->mtime)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->ctime)));
+      free (statbuf);
+
+void
+lstat (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      struct guestfs_stat *statbuf;
+ PPCODE:
+      statbuf = guestfs_lstat (g, path);
+      if (statbuf == NULL)
+        croak ("lstat: %s", guestfs_last_error (g));
+      EXTEND (SP, 13);
+      PUSHs (sv_2mortal (my_newSVll (statbuf->dev)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->ino)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->mode)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->nlink)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->uid)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->gid)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->rdev)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->size)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->blksize)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->blocks)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->atime)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->mtime)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->ctime)));
+      free (statbuf);
+
+void
+statvfs (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      struct guestfs_statvfs *statbuf;
+ PPCODE:
+      statbuf = guestfs_statvfs (g, path);
+      if (statbuf == NULL)
+        croak ("statvfs: %s", guestfs_last_error (g));
+      EXTEND (SP, 11);
+      PUSHs (sv_2mortal (my_newSVll (statbuf->bsize)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->frsize)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->blocks)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->bfree)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->bavail)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->files)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->ffree)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->favail)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->fsid)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->flag)));
+      PUSHs (sv_2mortal (my_newSVll (statbuf->namemax)));
+      free (statbuf);
+
+void
+tune2fs_l (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      char **superblock;
+      int i, n;
+ PPCODE:
+      superblock = guestfs_tune2fs_l (g, device);
+      if (superblock == NULL)
+        croak ("tune2fs_l: %s", guestfs_last_error (g));
+      for (n = 0; superblock[n] != NULL; ++n) /**/;
+      EXTEND (SP, n);
+      for (i = 0; i < n; ++i) {
+        PUSHs (sv_2mortal (newSVpv (superblock[i], 0)));
+        free (superblock[i]);
+      }
+      free (superblock);
+
+void
+blockdev_setro (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_blockdev_setro (g, device);
+      if (r == -1)
+        croak ("blockdev_setro: %s", guestfs_last_error (g));
+
+void
+blockdev_setrw (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_blockdev_setrw (g, device);
+      if (r == -1)
+        croak ("blockdev_setrw: %s", guestfs_last_error (g));
+
+SV *
+blockdev_getro (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int ro;
+   CODE:
+      ro = guestfs_blockdev_getro (g, device);
+      if (ro == -1)
+        croak ("blockdev_getro: %s", guestfs_last_error (g));
+      RETVAL = newSViv (ro);
+ OUTPUT:
+      RETVAL
+
+SV *
+blockdev_getss (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int sectorsize;
+   CODE:
+      sectorsize = guestfs_blockdev_getss (g, device);
+      if (sectorsize == -1)
+        croak ("blockdev_getss: %s", guestfs_last_error (g));
+      RETVAL = newSViv (sectorsize);
+ OUTPUT:
+      RETVAL
+
+SV *
+blockdev_getbsz (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int blocksize;
+   CODE:
+      blocksize = guestfs_blockdev_getbsz (g, device);
+      if (blocksize == -1)
+        croak ("blockdev_getbsz: %s", guestfs_last_error (g));
+      RETVAL = newSViv (blocksize);
+ OUTPUT:
+      RETVAL
+
+void
+blockdev_setbsz (g, device, blocksize)
+      guestfs_h *g;
+      char *device;
+      int blocksize;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_blockdev_setbsz (g, device, blocksize);
+      if (r == -1)
+        croak ("blockdev_setbsz: %s", guestfs_last_error (g));
+
+SV *
+blockdev_getsz (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int64_t sizeinsectors;
+   CODE:
+      sizeinsectors = guestfs_blockdev_getsz (g, device);
+      if (sizeinsectors == -1)
+        croak ("blockdev_getsz: %s", guestfs_last_error (g));
+      RETVAL = my_newSVll (sizeinsectors);
+ OUTPUT:
+      RETVAL
+
+SV *
+blockdev_getsize64 (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int64_t sizeinbytes;
+   CODE:
+      sizeinbytes = guestfs_blockdev_getsize64 (g, device);
+      if (sizeinbytes == -1)
+        croak ("blockdev_getsize64: %s", guestfs_last_error (g));
+      RETVAL = my_newSVll (sizeinbytes);
+ OUTPUT:
+      RETVAL
+
+void
+blockdev_flushbufs (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_blockdev_flushbufs (g, device);
+      if (r == -1)
+        croak ("blockdev_flushbufs: %s", guestfs_last_error (g));
+
+void
+blockdev_rereadpt (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_blockdev_rereadpt (g, device);
+      if (r == -1)
+        croak ("blockdev_rereadpt: %s", guestfs_last_error (g));
+
+void
+upload (g, filename, remotefilename)
+      guestfs_h *g;
+      char *filename;
+      char *remotefilename;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_upload (g, filename, remotefilename);
+      if (r == -1)
+        croak ("upload: %s", guestfs_last_error (g));
+
+void
+download (g, remotefilename, filename)
+      guestfs_h *g;
+      char *remotefilename;
+      char *filename;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_download (g, remotefilename, filename);
+      if (r == -1)
+        croak ("download: %s", guestfs_last_error (g));
+
+SV *
+checksum (g, csumtype, path)
+      guestfs_h *g;
+      char *csumtype;
+      char *path;
+PREINIT:
+      char *checksum;
+   CODE:
+      checksum = guestfs_checksum (g, csumtype, path);
+      if (checksum == NULL)
+        croak ("checksum: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (checksum, 0);
+      free (checksum);
+ OUTPUT:
+      RETVAL
+
+void
+tar_in (g, tarfile, directory)
+      guestfs_h *g;
+      char *tarfile;
+      char *directory;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_tar_in (g, tarfile, directory);
+      if (r == -1)
+        croak ("tar_in: %s", guestfs_last_error (g));
+
+void
+tar_out (g, directory, tarfile)
+      guestfs_h *g;
+      char *directory;
+      char *tarfile;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_tar_out (g, directory, tarfile);
+      if (r == -1)
+        croak ("tar_out: %s", guestfs_last_error (g));
+
+void
+tgz_in (g, tarball, directory)
+      guestfs_h *g;
+      char *tarball;
+      char *directory;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_tgz_in (g, tarball, directory);
+      if (r == -1)
+        croak ("tgz_in: %s", guestfs_last_error (g));
+
+void
+tgz_out (g, directory, tarball)
+      guestfs_h *g;
+      char *directory;
+      char *tarball;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_tgz_out (g, directory, tarball);
+      if (r == -1)
+        croak ("tgz_out: %s", guestfs_last_error (g));
+
+void
+mount_ro (g, device, mountpoint)
+      guestfs_h *g;
+      char *device;
+      char *mountpoint;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_mount_ro (g, device, mountpoint);
+      if (r == -1)
+        croak ("mount_ro: %s", guestfs_last_error (g));
+
+void
+mount_options (g, options, device, mountpoint)
+      guestfs_h *g;
+      char *options;
+      char *device;
+      char *mountpoint;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_mount_options (g, options, device, mountpoint);
+      if (r == -1)
+        croak ("mount_options: %s", guestfs_last_error (g));
+
+void
+mount_vfs (g, options, vfstype, device, mountpoint)
+      guestfs_h *g;
+      char *options;
+      char *vfstype;
+      char *device;
+      char *mountpoint;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_mount_vfs (g, options, vfstype, device, mountpoint);
+      if (r == -1)
+        croak ("mount_vfs: %s", guestfs_last_error (g));
+
+SV *
+debug (g, subcmd, extraargs)
+      guestfs_h *g;
+      char *subcmd;
+      char **extraargs;
+PREINIT:
+      char *result;
+   CODE:
+      result = guestfs_debug (g, subcmd, extraargs);
+      free (extraargs);
+      if (result == NULL)
+        croak ("debug: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (result, 0);
+      free (result);
+ OUTPUT:
+      RETVAL