X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-actions.c;h=a46b33955a2e2cddaebab3c52ea841c533733c6f;hp=c0762dfa8cc602c410fc7eaf0a504aeb55b6905e;hb=0884d8bbae6d76a603ec1385ada2938f88981c5c;hpb=8c3b820c2b687345448e3d74a7101b07ff32688e

diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c
index c0762df..a46b339 100644
--- a/src/guestfs-actions.c
+++ b/src/guestfs-actions.c
@@ -141,7 +141,7 @@ int guestfs_mount (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT,
         (xdrproc_t) xdr_guestfs_mount_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -152,22 +152,23 @@ int guestfs_mount (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mount");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -223,7 +224,7 @@ int guestfs_sync (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_SYNC, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -234,22 +235,23 @@ int guestfs_sync (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_sync");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SYNC, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -309,7 +311,7 @@ int guestfs_touch (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_TOUCH,
         (xdrproc_t) xdr_guestfs_touch_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -320,22 +322,23 @@ int guestfs_touch (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_touch");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TOUCH, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -400,7 +403,7 @@ char *guestfs_cat (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_CAT,
         (xdrproc_t) xdr_guestfs_cat_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -411,22 +414,23 @@ char *guestfs_cat (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_cat");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CAT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.content; /* caller will free */
 }
 
@@ -491,7 +495,7 @@ char *guestfs_ll (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_LL,
         (xdrproc_t) xdr_guestfs_ll_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -502,22 +506,23 @@ char *guestfs_ll (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_ll");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.listing; /* caller will free */
 }
 
@@ -582,7 +587,7 @@ char **guestfs_ls (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_LS,
         (xdrproc_t) xdr_guestfs_ls_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -593,22 +598,23 @@ char **guestfs_ls (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_ls");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.listing.listing_val =
     safe_realloc (g, ctx.ret.listing.listing_val,
@@ -674,7 +680,7 @@ char **guestfs_list_devices (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_LIST_DEVICES, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -685,22 +691,23 @@ char **guestfs_list_devices (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_list_devices");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_DEVICES, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.devices.devices_val =
     safe_realloc (g, ctx.ret.devices.devices_val,
@@ -766,7 +773,7 @@ char **guestfs_list_partitions (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_LIST_PARTITIONS, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -777,22 +784,23 @@ char **guestfs_list_partitions (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_list_partitions");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_PARTITIONS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.partitions.partitions_val =
     safe_realloc (g, ctx.ret.partitions.partitions_val,
@@ -858,7 +866,7 @@ char **guestfs_pvs (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_PVS, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -869,22 +877,23 @@ char **guestfs_pvs (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_pvs");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.physvols.physvols_val =
     safe_realloc (g, ctx.ret.physvols.physvols_val,
@@ -950,7 +959,7 @@ char **guestfs_vgs (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_VGS, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -961,22 +970,23 @@ char **guestfs_vgs (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_vgs");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.volgroups.volgroups_val =
     safe_realloc (g, ctx.ret.volgroups.volgroups_val,
@@ -1042,7 +1052,7 @@ char **guestfs_lvs (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_LVS, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -1053,22 +1063,23 @@ char **guestfs_lvs (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvs");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.logvols.logvols_val =
     safe_realloc (g, ctx.ret.logvols.logvols_val,
@@ -1134,7 +1145,7 @@ struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_PVS_FULL, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -1145,22 +1156,23 @@ struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_pvs_full");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS_FULL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.physvols, sizeof (ctx.ret.physvols));
 }
@@ -1222,7 +1234,7 @@ struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_VGS_FULL, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -1233,22 +1245,23 @@ struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_vgs_full");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS_FULL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.volgroups, sizeof (ctx.ret.volgroups));
 }
@@ -1310,7 +1323,7 @@ struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_LVS_FULL, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -1321,22 +1334,23 @@ struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvs_full");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS_FULL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.logvols, sizeof (ctx.ret.logvols));
 }
@@ -1402,7 +1416,7 @@ char **guestfs_read_lines (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_READ_LINES,
         (xdrproc_t) xdr_guestfs_read_lines_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -1413,22 +1427,23 @@ char **guestfs_read_lines (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_read_lines");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_READ_LINES, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.lines.lines_val =
     safe_realloc (g, ctx.ret.lines.lines_val,
@@ -1495,7 +1510,7 @@ int guestfs_aug_init (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_INIT,
         (xdrproc_t) xdr_guestfs_aug_init_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -1506,22 +1521,23 @@ int guestfs_aug_init (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_init");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INIT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -1577,7 +1593,7 @@ int guestfs_aug_close (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_CLOSE, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -1588,22 +1604,23 @@ int guestfs_aug_close (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_close");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_CLOSE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -1670,7 +1687,7 @@ int guestfs_aug_defvar (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_DEFVAR,
         (xdrproc_t) xdr_guestfs_aug_defvar_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -1681,22 +1698,23 @@ int guestfs_aug_defvar (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_defvar");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFVAR, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.nrnodes;
 }
 
@@ -1765,7 +1783,7 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_DEFNODE,
         (xdrproc_t) xdr_guestfs_aug_defnode_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -1776,22 +1794,23 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_defnode");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFNODE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller with free this */
   return safe_memdup (g, &ctx.ret, sizeof (ctx.ret));
 }
@@ -1857,7 +1876,7 @@ char *guestfs_aug_get (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_GET,
         (xdrproc_t) xdr_guestfs_aug_get_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -1868,22 +1887,23 @@ char *guestfs_aug_get (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_get");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_GET, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.val; /* caller will free */
 }
 
@@ -1945,7 +1965,7 @@ int guestfs_aug_set (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_SET,
         (xdrproc_t) xdr_guestfs_aug_set_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -1956,22 +1976,23 @@ int guestfs_aug_set (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_set");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SET, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2035,7 +2056,7 @@ int guestfs_aug_insert (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_INSERT,
         (xdrproc_t) xdr_guestfs_aug_insert_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2046,22 +2067,23 @@ int guestfs_aug_insert (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_insert");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INSERT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2126,7 +2148,7 @@ int guestfs_aug_rm (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_RM,
         (xdrproc_t) xdr_guestfs_aug_rm_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2137,22 +2159,23 @@ int guestfs_aug_rm (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_rm");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_RM, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.nrnodes;
 }
 
@@ -2214,7 +2237,7 @@ int guestfs_aug_mv (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_MV,
         (xdrproc_t) xdr_guestfs_aug_mv_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2225,22 +2248,23 @@ int guestfs_aug_mv (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_mv");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MV, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2305,7 +2329,7 @@ char **guestfs_aug_match (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_MATCH,
         (xdrproc_t) xdr_guestfs_aug_match_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -2316,22 +2340,23 @@ char **guestfs_aug_match (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_match");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MATCH, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.matches.matches_val =
     safe_realloc (g, ctx.ret.matches.matches_val,
@@ -2392,7 +2417,7 @@ int guestfs_aug_save (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_SAVE, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2403,22 +2428,23 @@ int guestfs_aug_save (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_save");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SAVE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2474,7 +2500,7 @@ int guestfs_aug_load (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_LOAD, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2485,22 +2511,23 @@ int guestfs_aug_load (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_load");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LOAD, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2565,7 +2592,7 @@ char **guestfs_aug_ls (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_LS,
         (xdrproc_t) xdr_guestfs_aug_ls_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -2576,22 +2603,23 @@ char **guestfs_aug_ls (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_ls");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.matches.matches_val =
     safe_realloc (g, ctx.ret.matches.matches_val,
@@ -2656,7 +2684,7 @@ int guestfs_rm (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_RM,
         (xdrproc_t) xdr_guestfs_rm_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2667,22 +2695,23 @@ int guestfs_rm (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_rm");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2742,7 +2771,7 @@ int guestfs_rmdir (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_RMDIR,
         (xdrproc_t) xdr_guestfs_rmdir_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2753,22 +2782,23 @@ int guestfs_rmdir (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_rmdir");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RMDIR, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2828,7 +2858,7 @@ int guestfs_rm_rf (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_RM_RF,
         (xdrproc_t) xdr_guestfs_rm_rf_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2839,22 +2869,23 @@ int guestfs_rm_rf (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_rm_rf");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM_RF, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -2914,7 +2945,7 @@ int guestfs_mkdir (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_MKDIR,
         (xdrproc_t) xdr_guestfs_mkdir_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -2925,22 +2956,23 @@ int guestfs_mkdir (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mkdir");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3000,7 +3032,7 @@ int guestfs_mkdir_p (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_MKDIR_P,
         (xdrproc_t) xdr_guestfs_mkdir_p_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3011,22 +3043,23 @@ int guestfs_mkdir_p (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mkdir_p");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR_P, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3088,7 +3121,7 @@ int guestfs_chmod (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_CHMOD,
         (xdrproc_t) xdr_guestfs_chmod_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3099,22 +3132,23 @@ int guestfs_chmod (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_chmod");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHMOD, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3178,7 +3212,7 @@ int guestfs_chown (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_CHOWN,
         (xdrproc_t) xdr_guestfs_chown_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3189,22 +3223,23 @@ int guestfs_chown (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_chown");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHOWN, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3269,7 +3304,7 @@ int guestfs_exists (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_EXISTS,
         (xdrproc_t) xdr_guestfs_exists_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3280,22 +3315,23 @@ int guestfs_exists (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_exists");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_EXISTS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.existsflag;
 }
 
@@ -3360,7 +3396,7 @@ int guestfs_is_file (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_IS_FILE,
         (xdrproc_t) xdr_guestfs_is_file_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3371,22 +3407,23 @@ int guestfs_is_file (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_is_file");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_FILE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.fileflag;
 }
 
@@ -3451,7 +3488,7 @@ int guestfs_is_dir (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_IS_DIR,
         (xdrproc_t) xdr_guestfs_is_dir_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3462,22 +3499,23 @@ int guestfs_is_dir (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_is_dir");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_DIR, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.dirflag;
 }
 
@@ -3537,7 +3575,7 @@ int guestfs_pvcreate (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_PVCREATE,
         (xdrproc_t) xdr_guestfs_pvcreate_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3548,22 +3586,23 @@ int guestfs_pvcreate (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_pvcreate");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVCREATE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3626,7 +3665,7 @@ int guestfs_vgcreate (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_VGCREATE,
         (xdrproc_t) xdr_guestfs_vgcreate_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3637,22 +3676,23 @@ int guestfs_vgcreate (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_vgcreate");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGCREATE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3716,7 +3756,7 @@ int guestfs_lvcreate (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_LVCREATE,
         (xdrproc_t) xdr_guestfs_lvcreate_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3727,22 +3767,23 @@ int guestfs_lvcreate (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvcreate");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVCREATE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3804,7 +3845,7 @@ int guestfs_mkfs (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_MKFS,
         (xdrproc_t) xdr_guestfs_mkfs_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3815,22 +3856,23 @@ int guestfs_mkfs (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mkfs");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKFS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3899,7 +3941,7 @@ int guestfs_sfdisk (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_SFDISK,
         (xdrproc_t) xdr_guestfs_sfdisk_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -3910,22 +3952,23 @@ int guestfs_sfdisk (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_sfdisk");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -3989,7 +4032,7 @@ int guestfs_write_file (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_WRITE_FILE,
         (xdrproc_t) xdr_guestfs_write_file_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -4000,22 +4043,23 @@ int guestfs_write_file (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_write_file");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WRITE_FILE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -4075,7 +4119,7 @@ int guestfs_umount (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_UMOUNT,
         (xdrproc_t) xdr_guestfs_umount_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -4086,22 +4130,23 @@ int guestfs_umount (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_umount");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -4162,7 +4207,7 @@ char **guestfs_mounts (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNTS, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4173,22 +4218,23 @@ char **guestfs_mounts (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mounts");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNTS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.devices.devices_val =
     safe_realloc (g, ctx.ret.devices.devices_val,
@@ -4249,7 +4295,7 @@ int guestfs_umount_all (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_UMOUNT_ALL, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -4260,22 +4306,23 @@ int guestfs_umount_all (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_umount_all");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT_ALL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -4331,7 +4378,7 @@ int guestfs_lvm_remove_all (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_LVM_REMOVE_ALL, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -4342,22 +4389,23 @@ int guestfs_lvm_remove_all (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvm_remove_all");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVM_REMOVE_ALL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -4422,7 +4470,7 @@ char *guestfs_file (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_FILE,
         (xdrproc_t) xdr_guestfs_file_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4433,22 +4481,23 @@ char *guestfs_file (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_file");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_FILE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.description; /* caller will free */
 }
 
@@ -4514,7 +4563,7 @@ char *guestfs_command (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_COMMAND,
         (xdrproc_t) xdr_guestfs_command_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4525,22 +4574,23 @@ char *guestfs_command (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_command");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.output; /* caller will free */
 }
 
@@ -4606,7 +4656,7 @@ char **guestfs_command_lines (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_COMMAND_LINES,
         (xdrproc_t) xdr_guestfs_command_lines_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4617,22 +4667,23 @@ char **guestfs_command_lines (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_command_lines");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND_LINES, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.lines.lines_val =
     safe_realloc (g, ctx.ret.lines.lines_val,
@@ -4702,7 +4753,7 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_STAT,
         (xdrproc_t) xdr_guestfs_stat_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4713,22 +4764,23 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_stat");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STAT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf));
 }
@@ -4794,7 +4846,7 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_LSTAT,
         (xdrproc_t) xdr_guestfs_lstat_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4805,22 +4857,23 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lstat");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LSTAT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf));
 }
@@ -4886,7 +4939,7 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_STATVFS,
         (xdrproc_t) xdr_guestfs_statvfs_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4897,22 +4950,23 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_statvfs");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STATVFS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf));
 }
@@ -4978,7 +5032,7 @@ char **guestfs_tune2fs_l (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_TUNE2FS_L,
         (xdrproc_t) xdr_guestfs_tune2fs_l_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -4989,22 +5043,23 @@ char **guestfs_tune2fs_l (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_tune2fs_l");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TUNE2FS_L, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   /* caller will free this, but we need to add a NULL entry */
   ctx.ret.superblock.superblock_val =
     safe_realloc (g, ctx.ret.superblock.superblock_val,
@@ -5069,7 +5124,7 @@ int guestfs_blockdev_setro (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETRO,
         (xdrproc_t) xdr_guestfs_blockdev_setro_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5080,22 +5135,23 @@ int guestfs_blockdev_setro (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setro");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRO, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -5155,7 +5211,7 @@ int guestfs_blockdev_setrw (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETRW,
         (xdrproc_t) xdr_guestfs_blockdev_setrw_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5166,22 +5222,23 @@ int guestfs_blockdev_setrw (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setrw");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRW, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -5246,7 +5303,7 @@ int guestfs_blockdev_getro (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETRO,
         (xdrproc_t) xdr_guestfs_blockdev_getro_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5257,22 +5314,23 @@ int guestfs_blockdev_getro (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getro");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETRO, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.ro;
 }
 
@@ -5337,7 +5395,7 @@ int guestfs_blockdev_getss (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSS,
         (xdrproc_t) xdr_guestfs_blockdev_getss_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5348,22 +5406,23 @@ int guestfs_blockdev_getss (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getss");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.sectorsize;
 }
 
@@ -5428,7 +5487,7 @@ int guestfs_blockdev_getbsz (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETBSZ,
         (xdrproc_t) xdr_guestfs_blockdev_getbsz_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5439,22 +5498,23 @@ int guestfs_blockdev_getbsz (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getbsz");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETBSZ, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.blocksize;
 }
 
@@ -5516,7 +5576,7 @@ int guestfs_blockdev_setbsz (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETBSZ,
         (xdrproc_t) xdr_guestfs_blockdev_setbsz_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5527,22 +5587,23 @@ int guestfs_blockdev_setbsz (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setbsz");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETBSZ, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -5607,7 +5668,7 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSZ,
         (xdrproc_t) xdr_guestfs_blockdev_getsz_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5618,22 +5679,23 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getsz");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSZ, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.sizeinsectors;
 }
 
@@ -5698,7 +5760,7 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSIZE64,
         (xdrproc_t) xdr_guestfs_blockdev_getsize64_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5709,22 +5771,23 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getsize64");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSIZE64, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.sizeinbytes;
 }
 
@@ -5784,7 +5847,7 @@ int guestfs_blockdev_flushbufs (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS,
         (xdrproc_t) xdr_guestfs_blockdev_flushbufs_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5795,22 +5858,23 @@ int guestfs_blockdev_flushbufs (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_flushbufs");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -5870,7 +5934,7 @@ int guestfs_blockdev_rereadpt (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_REREADPT,
         (xdrproc_t) xdr_guestfs_blockdev_rereadpt_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5881,22 +5945,23 @@ int guestfs_blockdev_rereadpt (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_rereadpt");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_REREADPT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -5957,7 +6022,7 @@ int guestfs_upload (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_UPLOAD,
         (xdrproc_t) xdr_guestfs_upload_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -5966,7 +6031,7 @@ int guestfs_upload (guestfs_h *g,
 
     r = guestfs__send_file_sync (g, filename);
     if (r == -1) {
-      guestfs_set_ready (g);
+      guestfs_end_busy (g);
       return -1;
     }
     if (r == -2) /* daemon cancelled */
@@ -5981,22 +6046,23 @@ int guestfs_upload (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_upload");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UPLOAD, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6057,7 +6123,7 @@ int guestfs_download (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_DOWNLOAD,
         (xdrproc_t) xdr_guestfs_download_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6068,27 +6134,28 @@ int guestfs_download (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_download");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DOWNLOAD, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (guestfs__receive_file_sync (g, filename) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6155,7 +6222,7 @@ char *guestfs_checksum (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_CHECKSUM,
         (xdrproc_t) xdr_guestfs_checksum_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -6166,22 +6233,23 @@ char *guestfs_checksum (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_checksum");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHECKSUM, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.checksum; /* caller will free */
 }
 
@@ -6242,7 +6310,7 @@ int guestfs_tar_in (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_TAR_IN,
         (xdrproc_t) xdr_guestfs_tar_in_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6251,7 +6319,7 @@ int guestfs_tar_in (guestfs_h *g,
 
     r = guestfs__send_file_sync (g, tarfile);
     if (r == -1) {
-      guestfs_set_ready (g);
+      guestfs_end_busy (g);
       return -1;
     }
     if (r == -2) /* daemon cancelled */
@@ -6266,22 +6334,23 @@ int guestfs_tar_in (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_tar_in");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAR_IN, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6342,7 +6411,7 @@ int guestfs_tar_out (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_TAR_OUT,
         (xdrproc_t) xdr_guestfs_tar_out_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6353,27 +6422,28 @@ int guestfs_tar_out (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_tar_out");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAR_OUT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (guestfs__receive_file_sync (g, tarfile) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6434,7 +6504,7 @@ int guestfs_tgz_in (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_TGZ_IN,
         (xdrproc_t) xdr_guestfs_tgz_in_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6443,7 +6513,7 @@ int guestfs_tgz_in (guestfs_h *g,
 
     r = guestfs__send_file_sync (g, tarball);
     if (r == -1) {
-      guestfs_set_ready (g);
+      guestfs_end_busy (g);
       return -1;
     }
     if (r == -2) /* daemon cancelled */
@@ -6458,22 +6528,23 @@ int guestfs_tgz_in (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_tgz_in");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TGZ_IN, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6534,7 +6605,7 @@ int guestfs_tgz_out (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_TGZ_OUT,
         (xdrproc_t) xdr_guestfs_tgz_out_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6545,27 +6616,28 @@ int guestfs_tgz_out (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_tgz_out");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TGZ_OUT, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (guestfs__receive_file_sync (g, tarball) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6627,7 +6699,7 @@ int guestfs_mount_ro (guestfs_h *g,
   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);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6638,22 +6710,23 @@ int guestfs_mount_ro (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mount_ro");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_RO, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6717,7 +6790,7 @@ int guestfs_mount_options (guestfs_h *g,
   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);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6728,22 +6801,23 @@ int guestfs_mount_options (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mount_options");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_OPTIONS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6809,7 +6883,7 @@ int guestfs_mount_vfs (guestfs_h *g,
   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);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -6820,22 +6894,23 @@ int guestfs_mount_vfs (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mount_vfs");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_VFS, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -6903,7 +6978,7 @@ char *guestfs_debug (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_DEBUG,
         (xdrproc_t) xdr_guestfs_debug_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -6914,22 +6989,23 @@ char *guestfs_debug (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_debug");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DEBUG, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.result; /* caller will free */
 }
 
@@ -6989,7 +7065,7 @@ int guestfs_lvremove (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_LVREMOVE,
         (xdrproc_t) xdr_guestfs_lvremove_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7000,22 +7076,23 @@ int guestfs_lvremove (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvremove");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVREMOVE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7075,7 +7152,7 @@ int guestfs_vgremove (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_VGREMOVE,
         (xdrproc_t) xdr_guestfs_vgremove_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7086,22 +7163,23 @@ int guestfs_vgremove (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_vgremove");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGREMOVE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7161,7 +7239,7 @@ int guestfs_pvremove (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_PVREMOVE,
         (xdrproc_t) xdr_guestfs_pvremove_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7172,22 +7250,23 @@ int guestfs_pvremove (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_pvremove");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVREMOVE, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7249,7 +7328,7 @@ int guestfs_set_e2label (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_SET_E2LABEL,
         (xdrproc_t) xdr_guestfs_set_e2label_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7260,22 +7339,23 @@ int guestfs_set_e2label (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_set_e2label");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SET_E2LABEL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7340,7 +7420,7 @@ char *guestfs_get_e2label (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_GET_E2LABEL,
         (xdrproc_t) xdr_guestfs_get_e2label_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -7351,22 +7431,23 @@ char *guestfs_get_e2label (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_get_e2label");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_GET_E2LABEL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.label; /* caller will free */
 }
 
@@ -7428,7 +7509,7 @@ int guestfs_set_e2uuid (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_SET_E2UUID,
         (xdrproc_t) xdr_guestfs_set_e2uuid_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7439,22 +7520,23 @@ int guestfs_set_e2uuid (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_set_e2uuid");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SET_E2UUID, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7519,7 +7601,7 @@ char *guestfs_get_e2uuid (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_GET_E2UUID,
         (xdrproc_t) xdr_guestfs_get_e2uuid_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -7530,22 +7612,23 @@ char *guestfs_get_e2uuid (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_get_e2uuid");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_GET_E2UUID, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.uuid; /* caller will free */
 }
 
@@ -7612,7 +7695,7 @@ int guestfs_fsck (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_FSCK,
         (xdrproc_t) xdr_guestfs_fsck_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7623,22 +7706,23 @@ int guestfs_fsck (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_fsck");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_FSCK, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.status;
 }
 
@@ -7698,7 +7782,7 @@ int guestfs_zero (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_ZERO,
         (xdrproc_t) xdr_guestfs_zero_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7709,22 +7793,23 @@ int guestfs_zero (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_zero");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_ZERO, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7786,7 +7871,7 @@ int guestfs_grub_install (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_GRUB_INSTALL,
         (xdrproc_t) xdr_guestfs_grub_install_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7797,22 +7882,23 @@ int guestfs_grub_install (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_grub_install");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_GRUB_INSTALL, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7874,7 +7960,7 @@ int guestfs_cp (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_CP,
         (xdrproc_t) xdr_guestfs_cp_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7885,22 +7971,23 @@ int guestfs_cp (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_cp");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CP, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -7962,7 +8049,7 @@ int guestfs_cp_a (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_CP_A,
         (xdrproc_t) xdr_guestfs_cp_a_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -7973,22 +8060,23 @@ int guestfs_cp_a (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_cp_a");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CP_A, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -8050,7 +8138,7 @@ int guestfs_mv (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_MV,
         (xdrproc_t) xdr_guestfs_mv_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -8061,22 +8149,23 @@ int guestfs_mv (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mv");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MV, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -8136,7 +8225,7 @@ int guestfs_drop_caches (guestfs_h *g,
   serial = guestfs__send_sync (g, GUESTFS_PROC_DROP_CACHES,
         (xdrproc_t) xdr_guestfs_drop_caches_args, (char *) &args);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -8147,22 +8236,23 @@ int guestfs_drop_caches (guestfs_h *g,
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_drop_caches");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DROP_CACHES, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
@@ -8223,7 +8313,7 @@ char *guestfs_dmesg (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_DMESG, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
@@ -8234,22 +8324,23 @@ char *guestfs_dmesg (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_dmesg");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DMESG, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return NULL;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return NULL;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return ctx.ret.kmsgs; /* caller will free */
 }
 
@@ -8305,7 +8396,7 @@ int guestfs_ping_daemon (guestfs_h *g)
 
   serial = guestfs__send_sync (g, GUESTFS_PROC_PING_DAEMON, NULL, NULL);
   if (serial == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
@@ -8316,22 +8407,4156 @@ int guestfs_ping_daemon (guestfs_h *g)
   guestfs_set_reply_callback (g, NULL, NULL);
   if (ctx.cb_sequence != 1) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_ping_daemon");
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PING_DAEMON, serial) == -1) {
-    guestfs_set_ready (g);
+    guestfs_end_busy (g);
     return -1;
   }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
-    guestfs_set_ready (g);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
     return -1;
   }
 
-  guestfs_set_ready (g);
+  guestfs_end_busy (g);
   return 0;
 }
 
+struct equal_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_equal_ret ret;
+};
+
+static void equal_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct equal_ctx *ctx = (struct equal_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_equal");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_equal");
+    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_equal");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_equal_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_equal");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_equal (guestfs_h *g,
+		const char *file1,
+		const char *file2)
+{
+  struct guestfs_equal_args args;
+  struct equal_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_equal") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.file1 = (char *) file1;
+  args.file2 = (char *) file2;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_EQUAL,
+        (xdrproc_t) xdr_guestfs_equal_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, equal_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_equal");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_EQUAL, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.equality;
+}
+
+struct strings_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_strings_ret ret;
+};
+
+static void strings_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct strings_ctx *ctx = (struct strings_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_strings");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_strings");
+    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_strings");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_strings_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_strings");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_strings (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_strings_args args;
+  struct strings_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_strings") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_STRINGS,
+        (xdrproc_t) xdr_guestfs_strings_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, strings_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_strings");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STRINGS, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.stringsout.stringsout_val =
+    safe_realloc (g, ctx.ret.stringsout.stringsout_val,
+                  sizeof (char *) * (ctx.ret.stringsout.stringsout_len + 1));
+  ctx.ret.stringsout.stringsout_val[ctx.ret.stringsout.stringsout_len] = NULL;
+  return ctx.ret.stringsout.stringsout_val;
+}
+
+struct strings_e_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_strings_e_ret ret;
+};
+
+static void strings_e_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct strings_e_ctx *ctx = (struct strings_e_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_strings_e");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_strings_e");
+    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_strings_e");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_strings_e_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_strings_e");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_strings_e (guestfs_h *g,
+		const char *encoding,
+		const char *path)
+{
+  struct guestfs_strings_e_args args;
+  struct strings_e_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_strings_e") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.encoding = (char *) encoding;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_STRINGS_E,
+        (xdrproc_t) xdr_guestfs_strings_e_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, strings_e_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_strings_e");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STRINGS_E, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.stringsout.stringsout_val =
+    safe_realloc (g, ctx.ret.stringsout.stringsout_val,
+                  sizeof (char *) * (ctx.ret.stringsout.stringsout_len + 1));
+  ctx.ret.stringsout.stringsout_val[ctx.ret.stringsout.stringsout_len] = NULL;
+  return ctx.ret.stringsout.stringsout_val;
+}
+
+struct hexdump_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_hexdump_ret ret;
+};
+
+static void hexdump_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct hexdump_ctx *ctx = (struct hexdump_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_hexdump");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_hexdump");
+    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_hexdump");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_hexdump_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_hexdump");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_hexdump (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_hexdump_args args;
+  struct hexdump_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_hexdump") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_HEXDUMP,
+        (xdrproc_t) xdr_guestfs_hexdump_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, hexdump_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_hexdump");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_HEXDUMP, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.dump; /* caller will free */
+}
+
+struct zerofree_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void zerofree_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct zerofree_ctx *ctx = (struct zerofree_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_zerofree");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_zerofree");
+    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_zerofree");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_zerofree (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_zerofree_args args;
+  struct zerofree_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_zerofree") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_ZEROFREE,
+        (xdrproc_t) xdr_guestfs_zerofree_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, zerofree_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_zerofree");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_ZEROFREE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct pvresize_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void pvresize_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct pvresize_ctx *ctx = (struct pvresize_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_pvresize");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_pvresize");
+    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_pvresize");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_pvresize (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_pvresize_args args;
+  struct pvresize_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_pvresize") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_PVRESIZE,
+        (xdrproc_t) xdr_guestfs_pvresize_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, pvresize_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_pvresize");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVRESIZE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct sfdisk_N_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void sfdisk_N_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct sfdisk_N_ctx *ctx = (struct sfdisk_N_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_sfdisk_N");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_sfdisk_N");
+    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_sfdisk_N");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_sfdisk_N (guestfs_h *g,
+		const char *device,
+		int partnum,
+		int cyls,
+		int heads,
+		int sectors,
+		const char *line)
+{
+  struct guestfs_sfdisk_N_args args;
+  struct sfdisk_N_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_sfdisk_N") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  args.partnum = partnum;
+  args.cyls = cyls;
+  args.heads = heads;
+  args.sectors = sectors;
+  args.line = (char *) line;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SFDISK_N,
+        (xdrproc_t) xdr_guestfs_sfdisk_N_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, sfdisk_N_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_sfdisk_N");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK_N, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct sfdisk_l_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_sfdisk_l_ret ret;
+};
+
+static void sfdisk_l_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct sfdisk_l_ctx *ctx = (struct sfdisk_l_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_sfdisk_l");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_sfdisk_l");
+    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_sfdisk_l");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_sfdisk_l_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_sfdisk_l");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_sfdisk_l (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_sfdisk_l_args args;
+  struct sfdisk_l_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_sfdisk_l") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SFDISK_L,
+        (xdrproc_t) xdr_guestfs_sfdisk_l_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, sfdisk_l_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_sfdisk_l");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK_L, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.partitions; /* caller will free */
+}
+
+struct sfdisk_kernel_geometry_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_sfdisk_kernel_geometry_ret ret;
+};
+
+static void sfdisk_kernel_geometry_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct sfdisk_kernel_geometry_ctx *ctx = (struct sfdisk_kernel_geometry_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_sfdisk_kernel_geometry");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_sfdisk_kernel_geometry");
+    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_sfdisk_kernel_geometry");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_sfdisk_kernel_geometry_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_sfdisk_kernel_geometry");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_sfdisk_kernel_geometry (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_sfdisk_kernel_geometry_args args;
+  struct sfdisk_kernel_geometry_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_sfdisk_kernel_geometry") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SFDISK_KERNEL_GEOMETRY,
+        (xdrproc_t) xdr_guestfs_sfdisk_kernel_geometry_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, sfdisk_kernel_geometry_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_sfdisk_kernel_geometry");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK_KERNEL_GEOMETRY, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.partitions; /* caller will free */
+}
+
+struct sfdisk_disk_geometry_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_sfdisk_disk_geometry_ret ret;
+};
+
+static void sfdisk_disk_geometry_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct sfdisk_disk_geometry_ctx *ctx = (struct sfdisk_disk_geometry_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_sfdisk_disk_geometry");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_sfdisk_disk_geometry");
+    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_sfdisk_disk_geometry");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_sfdisk_disk_geometry_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_sfdisk_disk_geometry");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_sfdisk_disk_geometry (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_sfdisk_disk_geometry_args args;
+  struct sfdisk_disk_geometry_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_sfdisk_disk_geometry") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SFDISK_DISK_GEOMETRY,
+        (xdrproc_t) xdr_guestfs_sfdisk_disk_geometry_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, sfdisk_disk_geometry_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_sfdisk_disk_geometry");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK_DISK_GEOMETRY, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.partitions; /* caller will free */
+}
+
+struct vg_activate_all_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void vg_activate_all_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct vg_activate_all_ctx *ctx = (struct vg_activate_all_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_vg_activate_all");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_vg_activate_all");
+    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_vg_activate_all");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_vg_activate_all (guestfs_h *g,
+		int activate)
+{
+  struct guestfs_vg_activate_all_args args;
+  struct vg_activate_all_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_vg_activate_all") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.activate = activate;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_VG_ACTIVATE_ALL,
+        (xdrproc_t) xdr_guestfs_vg_activate_all_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, vg_activate_all_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_vg_activate_all");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VG_ACTIVATE_ALL, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct vg_activate_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void vg_activate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct vg_activate_ctx *ctx = (struct vg_activate_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_vg_activate");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_vg_activate");
+    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_vg_activate");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_vg_activate (guestfs_h *g,
+		int activate,
+		char * const* const volgroups)
+{
+  struct guestfs_vg_activate_args args;
+  struct vg_activate_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_vg_activate") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.activate = activate;
+  args.volgroups.volgroups_val = (char **) volgroups;
+  for (args.volgroups.volgroups_len = 0; volgroups[args.volgroups.volgroups_len]; args.volgroups.volgroups_len++) ;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_VG_ACTIVATE,
+        (xdrproc_t) xdr_guestfs_vg_activate_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, vg_activate_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_vg_activate");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VG_ACTIVATE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct lvresize_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void lvresize_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct lvresize_ctx *ctx = (struct lvresize_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_lvresize");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_lvresize");
+    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_lvresize");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_lvresize (guestfs_h *g,
+		const char *device,
+		int mbytes)
+{
+  struct guestfs_lvresize_args args;
+  struct lvresize_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_lvresize") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  args.mbytes = mbytes;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LVRESIZE,
+        (xdrproc_t) xdr_guestfs_lvresize_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, lvresize_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_lvresize");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVRESIZE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct resize2fs_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void resize2fs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct resize2fs_ctx *ctx = (struct resize2fs_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_resize2fs");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_resize2fs");
+    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_resize2fs");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_resize2fs (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_resize2fs_args args;
+  struct resize2fs_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_resize2fs") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_RESIZE2FS,
+        (xdrproc_t) xdr_guestfs_resize2fs_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, resize2fs_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_resize2fs");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RESIZE2FS, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct find_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_find_ret ret;
+};
+
+static void find_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct find_ctx *ctx = (struct find_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_find");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_find");
+    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_find");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_find_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_find");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_find (guestfs_h *g,
+		const char *directory)
+{
+  struct guestfs_find_args args;
+  struct find_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_find") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.directory = (char *) directory;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_FIND,
+        (xdrproc_t) xdr_guestfs_find_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, find_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_find");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_FIND, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.names.names_val =
+    safe_realloc (g, ctx.ret.names.names_val,
+                  sizeof (char *) * (ctx.ret.names.names_len + 1));
+  ctx.ret.names.names_val[ctx.ret.names.names_len] = NULL;
+  return ctx.ret.names.names_val;
+}
+
+struct e2fsck_f_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void e2fsck_f_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct e2fsck_f_ctx *ctx = (struct e2fsck_f_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_e2fsck_f");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_e2fsck_f");
+    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_e2fsck_f");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_e2fsck_f (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_e2fsck_f_args args;
+  struct e2fsck_f_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_e2fsck_f") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_E2FSCK_F,
+        (xdrproc_t) xdr_guestfs_e2fsck_f_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, e2fsck_f_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_e2fsck_f");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_E2FSCK_F, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct sleep_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void sleep_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct sleep_ctx *ctx = (struct sleep_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_sleep");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_sleep");
+    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_sleep");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_sleep (guestfs_h *g,
+		int secs)
+{
+  struct guestfs_sleep_args args;
+  struct sleep_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_sleep") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.secs = secs;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SLEEP,
+        (xdrproc_t) xdr_guestfs_sleep_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, sleep_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_sleep");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SLEEP, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct ntfs_3g_probe_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_ntfs_3g_probe_ret ret;
+};
+
+static void ntfs_3g_probe_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct ntfs_3g_probe_ctx *ctx = (struct ntfs_3g_probe_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_ntfs_3g_probe");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_ntfs_3g_probe");
+    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_ntfs_3g_probe");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_ntfs_3g_probe_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_ntfs_3g_probe");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_ntfs_3g_probe (guestfs_h *g,
+		int rw,
+		const char *device)
+{
+  struct guestfs_ntfs_3g_probe_args args;
+  struct ntfs_3g_probe_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_ntfs_3g_probe") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.rw = rw;
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_NTFS_3G_PROBE,
+        (xdrproc_t) xdr_guestfs_ntfs_3g_probe_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, ntfs_3g_probe_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_ntfs_3g_probe");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_NTFS_3G_PROBE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.status;
+}
+
+struct sh_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_sh_ret ret;
+};
+
+static void sh_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct sh_ctx *ctx = (struct sh_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_sh");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_sh");
+    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_sh");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_sh_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_sh");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_sh (guestfs_h *g,
+		const char *command)
+{
+  struct guestfs_sh_args args;
+  struct sh_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_sh") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.command = (char *) command;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SH,
+        (xdrproc_t) xdr_guestfs_sh_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, sh_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_sh");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SH, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.output; /* caller will free */
+}
+
+struct sh_lines_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_sh_lines_ret ret;
+};
+
+static void sh_lines_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct sh_lines_ctx *ctx = (struct sh_lines_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_sh_lines");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_sh_lines");
+    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_sh_lines");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_sh_lines_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_sh_lines");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_sh_lines (guestfs_h *g,
+		const char *command)
+{
+  struct guestfs_sh_lines_args args;
+  struct sh_lines_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_sh_lines") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.command = (char *) command;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SH_LINES,
+        (xdrproc_t) xdr_guestfs_sh_lines_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, sh_lines_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_sh_lines");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SH_LINES, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.lines.lines_val =
+    safe_realloc (g, ctx.ret.lines.lines_val,
+                  sizeof (char *) * (ctx.ret.lines.lines_len + 1));
+  ctx.ret.lines.lines_val[ctx.ret.lines.lines_len] = NULL;
+  return ctx.ret.lines.lines_val;
+}
+
+struct glob_expand_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_glob_expand_ret ret;
+};
+
+static void glob_expand_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct glob_expand_ctx *ctx = (struct glob_expand_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_glob_expand");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_glob_expand");
+    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_glob_expand");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_glob_expand_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_glob_expand");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_glob_expand (guestfs_h *g,
+		const char *pattern)
+{
+  struct guestfs_glob_expand_args args;
+  struct glob_expand_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_glob_expand") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.pattern = (char *) pattern;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_GLOB_EXPAND,
+        (xdrproc_t) xdr_guestfs_glob_expand_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, glob_expand_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_glob_expand");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_GLOB_EXPAND, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.paths.paths_val =
+    safe_realloc (g, ctx.ret.paths.paths_val,
+                  sizeof (char *) * (ctx.ret.paths.paths_len + 1));
+  ctx.ret.paths.paths_val[ctx.ret.paths.paths_len] = NULL;
+  return ctx.ret.paths.paths_val;
+}
+
+struct scrub_device_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void scrub_device_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct scrub_device_ctx *ctx = (struct scrub_device_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_scrub_device");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_scrub_device");
+    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_scrub_device");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_scrub_device (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_scrub_device_args args;
+  struct scrub_device_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_scrub_device") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SCRUB_DEVICE,
+        (xdrproc_t) xdr_guestfs_scrub_device_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, scrub_device_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_scrub_device");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SCRUB_DEVICE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct scrub_file_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void scrub_file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct scrub_file_ctx *ctx = (struct scrub_file_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_scrub_file");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_scrub_file");
+    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_scrub_file");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_scrub_file (guestfs_h *g,
+		const char *file)
+{
+  struct guestfs_scrub_file_args args;
+  struct scrub_file_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_scrub_file") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.file = (char *) file;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SCRUB_FILE,
+        (xdrproc_t) xdr_guestfs_scrub_file_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, scrub_file_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_scrub_file");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SCRUB_FILE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct scrub_freespace_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void scrub_freespace_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct scrub_freespace_ctx *ctx = (struct scrub_freespace_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_scrub_freespace");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_scrub_freespace");
+    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_scrub_freespace");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_scrub_freespace (guestfs_h *g,
+		const char *dir)
+{
+  struct guestfs_scrub_freespace_args args;
+  struct scrub_freespace_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_scrub_freespace") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.dir = (char *) dir;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SCRUB_FREESPACE,
+        (xdrproc_t) xdr_guestfs_scrub_freespace_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, scrub_freespace_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_scrub_freespace");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SCRUB_FREESPACE, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mkdtemp_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_mkdtemp_ret ret;
+};
+
+static void mkdtemp_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mkdtemp_ctx *ctx = (struct mkdtemp_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mkdtemp");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mkdtemp");
+    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_mkdtemp");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_mkdtemp_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_mkdtemp");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_mkdtemp (guestfs_h *g,
+		const char *template)
+{
+  struct guestfs_mkdtemp_args args;
+  struct mkdtemp_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mkdtemp") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.template = (char *) template;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKDTEMP,
+        (xdrproc_t) xdr_guestfs_mkdtemp_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mkdtemp_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mkdtemp");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDTEMP, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.dir; /* caller will free */
+}
+
+struct wc_l_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_wc_l_ret ret;
+};
+
+static void wc_l_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct wc_l_ctx *ctx = (struct wc_l_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_wc_l");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_wc_l");
+    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_wc_l");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_wc_l_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_wc_l");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_wc_l (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_wc_l_args args;
+  struct wc_l_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_wc_l") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_WC_L,
+        (xdrproc_t) xdr_guestfs_wc_l_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, wc_l_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_wc_l");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WC_L, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.lines;
+}
+
+struct wc_w_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_wc_w_ret ret;
+};
+
+static void wc_w_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct wc_w_ctx *ctx = (struct wc_w_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_wc_w");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_wc_w");
+    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_wc_w");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_wc_w_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_wc_w");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_wc_w (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_wc_w_args args;
+  struct wc_w_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_wc_w") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_WC_W,
+        (xdrproc_t) xdr_guestfs_wc_w_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, wc_w_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_wc_w");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WC_W, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.words;
+}
+
+struct wc_c_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_wc_c_ret ret;
+};
+
+static void wc_c_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct wc_c_ctx *ctx = (struct wc_c_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_wc_c");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_wc_c");
+    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_wc_c");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_wc_c_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_wc_c");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_wc_c (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_wc_c_args args;
+  struct wc_c_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_wc_c") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_WC_C,
+        (xdrproc_t) xdr_guestfs_wc_c_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, wc_c_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_wc_c");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WC_C, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.chars;
+}
+
+struct head_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_head_ret ret;
+};
+
+static void head_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct head_ctx *ctx = (struct head_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_head");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_head");
+    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_head");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_head_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_head");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_head (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_head_args args;
+  struct head_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_head") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_HEAD,
+        (xdrproc_t) xdr_guestfs_head_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, head_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_head");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_HEAD, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.lines.lines_val =
+    safe_realloc (g, ctx.ret.lines.lines_val,
+                  sizeof (char *) * (ctx.ret.lines.lines_len + 1));
+  ctx.ret.lines.lines_val[ctx.ret.lines.lines_len] = NULL;
+  return ctx.ret.lines.lines_val;
+}
+
+struct head_n_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_head_n_ret ret;
+};
+
+static void head_n_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct head_n_ctx *ctx = (struct head_n_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_head_n");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_head_n");
+    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_head_n");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_head_n_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_head_n");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_head_n (guestfs_h *g,
+		int nrlines,
+		const char *path)
+{
+  struct guestfs_head_n_args args;
+  struct head_n_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_head_n") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.nrlines = nrlines;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_HEAD_N,
+        (xdrproc_t) xdr_guestfs_head_n_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, head_n_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_head_n");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_HEAD_N, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.lines.lines_val =
+    safe_realloc (g, ctx.ret.lines.lines_val,
+                  sizeof (char *) * (ctx.ret.lines.lines_len + 1));
+  ctx.ret.lines.lines_val[ctx.ret.lines.lines_len] = NULL;
+  return ctx.ret.lines.lines_val;
+}
+
+struct tail_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_tail_ret ret;
+};
+
+static void tail_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct tail_ctx *ctx = (struct tail_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_tail");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_tail");
+    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_tail");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_tail_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_tail");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_tail (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_tail_args args;
+  struct tail_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_tail") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_TAIL,
+        (xdrproc_t) xdr_guestfs_tail_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, tail_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_tail");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAIL, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.lines.lines_val =
+    safe_realloc (g, ctx.ret.lines.lines_val,
+                  sizeof (char *) * (ctx.ret.lines.lines_len + 1));
+  ctx.ret.lines.lines_val[ctx.ret.lines.lines_len] = NULL;
+  return ctx.ret.lines.lines_val;
+}
+
+struct tail_n_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_tail_n_ret ret;
+};
+
+static void tail_n_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct tail_n_ctx *ctx = (struct tail_n_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_tail_n");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_tail_n");
+    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_tail_n");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_tail_n_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_tail_n");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_tail_n (guestfs_h *g,
+		int nrlines,
+		const char *path)
+{
+  struct guestfs_tail_n_args args;
+  struct tail_n_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_tail_n") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.nrlines = nrlines;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_TAIL_N,
+        (xdrproc_t) xdr_guestfs_tail_n_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, tail_n_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_tail_n");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAIL_N, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.lines.lines_val =
+    safe_realloc (g, ctx.ret.lines.lines_val,
+                  sizeof (char *) * (ctx.ret.lines.lines_len + 1));
+  ctx.ret.lines.lines_val[ctx.ret.lines.lines_len] = NULL;
+  return ctx.ret.lines.lines_val;
+}
+
+struct df_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_df_ret ret;
+};
+
+static void df_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct df_ctx *ctx = (struct df_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_df");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_df");
+    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_df");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_df_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_df");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_df (guestfs_h *g)
+{
+  struct df_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_df") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  serial = guestfs__send_sync (g, GUESTFS_PROC_DF, NULL, NULL);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, df_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_df");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DF, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.output; /* caller will free */
+}
+
+struct df_h_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_df_h_ret ret;
+};
+
+static void df_h_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct df_h_ctx *ctx = (struct df_h_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_df_h");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_df_h");
+    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_df_h");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_df_h_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_df_h");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_df_h (guestfs_h *g)
+{
+  struct df_h_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_df_h") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  serial = guestfs__send_sync (g, GUESTFS_PROC_DF_H, NULL, NULL);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, df_h_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_df_h");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DF_H, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.output; /* caller will free */
+}
+
+struct du_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_du_ret ret;
+};
+
+static void du_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct du_ctx *ctx = (struct du_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_du");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_du");
+    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_du");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_du_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_du");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int64_t guestfs_du (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_du_args args;
+  struct du_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_du") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_DU,
+        (xdrproc_t) xdr_guestfs_du_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, du_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_du");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DU, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.sizekb;
+}
+
+struct initrd_list_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_initrd_list_ret ret;
+};
+
+static void initrd_list_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct initrd_list_ctx *ctx = (struct initrd_list_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_initrd_list");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_initrd_list");
+    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_initrd_list");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_initrd_list_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_initrd_list");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_initrd_list (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_initrd_list_args args;
+  struct initrd_list_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_initrd_list") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_INITRD_LIST,
+        (xdrproc_t) xdr_guestfs_initrd_list_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, initrd_list_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_initrd_list");
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_INITRD_LIST, serial) == -1) {
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return NULL;
+  }
+
+  guestfs_end_busy (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.filenames.filenames_val =
+    safe_realloc (g, ctx.ret.filenames.filenames_val,
+                  sizeof (char *) * (ctx.ret.filenames.filenames_len + 1));
+  ctx.ret.filenames.filenames_val[ctx.ret.filenames.filenames_len] = NULL;
+  return ctx.ret.filenames.filenames_val;
+}
+
+struct mount_loop_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mount_loop_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mount_loop_ctx *ctx = (struct mount_loop_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mount_loop");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mount_loop");
+    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_loop");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mount_loop (guestfs_h *g,
+		const char *file,
+		const char *mountpoint)
+{
+  struct guestfs_mount_loop_args args;
+  struct mount_loop_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mount_loop") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.file = (char *) file;
+  args.mountpoint = (char *) mountpoint;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_LOOP,
+        (xdrproc_t) xdr_guestfs_mount_loop_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mount_loop_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mount_loop");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_LOOP, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mkswap_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mkswap_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mkswap_ctx *ctx = (struct mkswap_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mkswap");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mkswap");
+    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_mkswap");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mkswap (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_mkswap_args args;
+  struct mkswap_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mkswap") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKSWAP,
+        (xdrproc_t) xdr_guestfs_mkswap_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mkswap_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mkswap");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKSWAP, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mkswap_L_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mkswap_L_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mkswap_L_ctx *ctx = (struct mkswap_L_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mkswap_L");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mkswap_L");
+    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_mkswap_L");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mkswap_L (guestfs_h *g,
+		const char *label,
+		const char *device)
+{
+  struct guestfs_mkswap_L_args args;
+  struct mkswap_L_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mkswap_L") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.label = (char *) label;
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKSWAP_L,
+        (xdrproc_t) xdr_guestfs_mkswap_L_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mkswap_L_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mkswap_L");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKSWAP_L, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mkswap_U_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mkswap_U_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mkswap_U_ctx *ctx = (struct mkswap_U_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mkswap_U");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mkswap_U");
+    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_mkswap_U");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mkswap_U (guestfs_h *g,
+		const char *uuid,
+		const char *device)
+{
+  struct guestfs_mkswap_U_args args;
+  struct mkswap_U_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mkswap_U") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.uuid = (char *) uuid;
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKSWAP_U,
+        (xdrproc_t) xdr_guestfs_mkswap_U_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mkswap_U_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mkswap_U");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKSWAP_U, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mknod_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mknod_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mknod_ctx *ctx = (struct mknod_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mknod");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mknod");
+    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_mknod");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mknod (guestfs_h *g,
+		int mode,
+		int devmajor,
+		int devminor,
+		const char *path)
+{
+  struct guestfs_mknod_args args;
+  struct mknod_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mknod") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.mode = mode;
+  args.devmajor = devmajor;
+  args.devminor = devminor;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKNOD,
+        (xdrproc_t) xdr_guestfs_mknod_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mknod_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mknod");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKNOD, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mkfifo_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mkfifo_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mkfifo_ctx *ctx = (struct mkfifo_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mkfifo");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mkfifo");
+    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_mkfifo");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mkfifo (guestfs_h *g,
+		int mode,
+		const char *path)
+{
+  struct guestfs_mkfifo_args args;
+  struct mkfifo_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mkfifo") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.mode = mode;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKFIFO,
+        (xdrproc_t) xdr_guestfs_mkfifo_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mkfifo_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mkfifo");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKFIFO, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mknod_b_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mknod_b_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mknod_b_ctx *ctx = (struct mknod_b_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mknod_b");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mknod_b");
+    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_mknod_b");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mknod_b (guestfs_h *g,
+		int mode,
+		int devmajor,
+		int devminor,
+		const char *path)
+{
+  struct guestfs_mknod_b_args args;
+  struct mknod_b_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mknod_b") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.mode = mode;
+  args.devmajor = devmajor;
+  args.devminor = devminor;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKNOD_B,
+        (xdrproc_t) xdr_guestfs_mknod_b_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mknod_b_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mknod_b");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKNOD_B, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct mknod_c_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mknod_c_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mknod_c_ctx *ctx = (struct mknod_c_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_mknod_c");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mknod_c");
+    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_mknod_c");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_mknod_c (guestfs_h *g,
+		int mode,
+		int devmajor,
+		int devminor,
+		const char *path)
+{
+  struct guestfs_mknod_c_args args;
+  struct mknod_c_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mknod_c") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.mode = mode;
+  args.devmajor = devmajor;
+  args.devminor = devminor;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKNOD_C,
+        (xdrproc_t) xdr_guestfs_mknod_c_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mknod_c_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mknod_c");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKNOD_C, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return 0;
+}
+
+struct umask_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 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_umask_ret ret;
+};
+
+static void umask_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct umask_ctx *ctx = (struct umask_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_umask");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_umask");
+    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_umask");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_umask_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_umask");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+int guestfs_umask (guestfs_h *g,
+		int mask)
+{
+  struct guestfs_umask_args args;
+  struct umask_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_umask") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.mask = mask;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_UMASK,
+        (xdrproc_t) xdr_guestfs_umask_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, umask_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_umask");
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMASK, serial) == -1) {
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    free (ctx.err.error_message);
+    guestfs_end_busy (g);
+    return -1;
+  }
+
+  guestfs_end_busy (g);
+  return ctx.ret.oldmask;
+}
+