X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fguestfs-actions.c;h=68f122aa2580b311e79993d3ffa4b55224712253;hb=0583c8c2c3500715fe5757d2e2fcb0fdc019c2ae;hp=e9de5d675f38fee82fe8267fc5d02d4f490f0c48;hpb=42a8baf3c9abc6f742671f37e9e24b607e5f9857;p=libguestfs.git

diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c
index e9de5d6..68f122a 100644
--- a/src/guestfs-actions.c
+++ b/src/guestfs-actions.c
@@ -87,28 +87,19 @@ struct mount_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void mount_send_cb (guestfs_h *g, void *data)
+static void mount_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mount_ctx *ctx = (struct mount_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void mount_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct mount_ctx *ctx = (struct mount_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_mount");
@@ -122,8 +113,7 @@ static void mount_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_mount (guestfs_h *g,
@@ -136,42 +126,42 @@ int guestfs_mount (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_mount") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
   args.mountpoint = (char *) mountpoint;
-  serial = guestfs__send (g, GUESTFS_PROC_MOUNT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT,
         (xdrproc_t) xdr_guestfs_mount_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, mount_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_mount");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, mount_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mount");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -179,28 +169,19 @@ struct sync_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void sync_send_cb (guestfs_h *g, void *data)
+static void sync_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct sync_ctx *ctx = (struct sync_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void sync_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct sync_ctx *ctx = (struct sync_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_sync");
@@ -214,8 +195,7 @@ static void sync_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_sync (guestfs_h *g)
@@ -225,39 +205,39 @@ int guestfs_sync (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_sync") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_SYNC, NULL, NULL);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, sync_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_sync");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SYNC, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, sync_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_sync");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SYNC, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SYNC, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -265,28 +245,19 @@ struct touch_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void touch_send_cb (guestfs_h *g, void *data)
+static void touch_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct touch_ctx *ctx = (struct touch_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void touch_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct touch_ctx *ctx = (struct touch_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_touch");
@@ -300,8 +271,7 @@ static void touch_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_touch (guestfs_h *g,
@@ -313,41 +283,41 @@ int guestfs_touch (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_touch") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_TOUCH,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_TOUCH,
         (xdrproc_t) xdr_guestfs_touch_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, touch_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_touch");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, touch_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_touch");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TOUCH, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TOUCH, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -355,8 +325,7 @@ struct cat_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -364,20 +333,12 @@ struct cat_ctx {
   struct guestfs_cat_ret ret;
 };
 
-static void cat_send_cb (guestfs_h *g, void *data)
+static void cat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct cat_ctx *ctx = (struct cat_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void cat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct cat_ctx *ctx = (struct cat_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_cat");
@@ -395,8 +356,7 @@ static void cat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char *guestfs_cat (guestfs_h *g,
@@ -408,41 +368,41 @@ char *guestfs_cat (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_cat") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_CAT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_CAT,
         (xdrproc_t) xdr_guestfs_cat_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, cat_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_cat");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, cat_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_cat");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CAT, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CAT, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.content; /* caller will free */
 }
 
@@ -450,8 +410,7 @@ struct ll_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -459,20 +418,12 @@ struct ll_ctx {
   struct guestfs_ll_ret ret;
 };
 
-static void ll_send_cb (guestfs_h *g, void *data)
+static void ll_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct ll_ctx *ctx = (struct ll_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void ll_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct ll_ctx *ctx = (struct ll_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_ll");
@@ -490,8 +441,7 @@ static void ll_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char *guestfs_ll (guestfs_h *g,
@@ -503,41 +453,41 @@ char *guestfs_ll (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_ll") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.directory = (char *) directory;
-  serial = guestfs__send (g, GUESTFS_PROC_LL,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LL,
         (xdrproc_t) xdr_guestfs_ll_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, ll_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_ll");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, ll_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_ll");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LL, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LL, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.listing; /* caller will free */
 }
 
@@ -545,8 +495,7 @@ struct ls_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -554,20 +503,12 @@ struct ls_ctx {
   struct guestfs_ls_ret ret;
 };
 
-static void ls_send_cb (guestfs_h *g, void *data)
+static void ls_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct ls_ctx *ctx = (struct ls_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void ls_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct ls_ctx *ctx = (struct ls_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_ls");
@@ -585,8 +526,7 @@ static void ls_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_ls (guestfs_h *g,
@@ -598,41 +538,41 @@ char **guestfs_ls (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_ls") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.directory = (char *) directory;
-  serial = guestfs__send (g, GUESTFS_PROC_LS,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LS,
         (xdrproc_t) xdr_guestfs_ls_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, ls_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_ls");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, ls_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_ls");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -645,8 +585,7 @@ struct list_devices_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -654,20 +593,12 @@ struct list_devices_ctx {
   struct guestfs_list_devices_ret ret;
 };
 
-static void list_devices_send_cb (guestfs_h *g, void *data)
+static void list_devices_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct list_devices_ctx *ctx = (struct list_devices_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void list_devices_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct list_devices_ctx *ctx = (struct list_devices_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_list_devices");
@@ -685,8 +616,7 @@ static void list_devices_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_list_devices (guestfs_h *g)
@@ -696,39 +626,39 @@ char **guestfs_list_devices (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_list_devices") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_LIST_DEVICES, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, list_devices_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_list_devices");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LIST_DEVICES, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, list_devices_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_list_devices");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_DEVICES, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_DEVICES, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -741,8 +671,7 @@ struct list_partitions_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -750,20 +679,12 @@ struct list_partitions_ctx {
   struct guestfs_list_partitions_ret ret;
 };
 
-static void list_partitions_send_cb (guestfs_h *g, void *data)
+static void list_partitions_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct list_partitions_ctx *ctx = (struct list_partitions_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void list_partitions_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct list_partitions_ctx *ctx = (struct list_partitions_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_list_partitions");
@@ -781,8 +702,7 @@ static void list_partitions_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_list_partitions (guestfs_h *g)
@@ -792,39 +712,39 @@ char **guestfs_list_partitions (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_list_partitions") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_LIST_PARTITIONS, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, list_partitions_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_list_partitions");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LIST_PARTITIONS, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, list_partitions_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_list_partitions");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_PARTITIONS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LIST_PARTITIONS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -837,8 +757,7 @@ struct pvs_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -846,20 +765,12 @@ struct pvs_ctx {
   struct guestfs_pvs_ret ret;
 };
 
-static void pvs_send_cb (guestfs_h *g, void *data)
+static void pvs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct pvs_ctx *ctx = (struct pvs_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void pvs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct pvs_ctx *ctx = (struct pvs_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_pvs");
@@ -877,8 +788,7 @@ static void pvs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_pvs (guestfs_h *g)
@@ -888,39 +798,39 @@ char **guestfs_pvs (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_pvs") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_PVS, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, pvs_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_pvs");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_PVS, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, pvs_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_pvs");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -933,8 +843,7 @@ struct vgs_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -942,20 +851,12 @@ struct vgs_ctx {
   struct guestfs_vgs_ret ret;
 };
 
-static void vgs_send_cb (guestfs_h *g, void *data)
+static void vgs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct vgs_ctx *ctx = (struct vgs_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void vgs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct vgs_ctx *ctx = (struct vgs_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_vgs");
@@ -973,8 +874,7 @@ static void vgs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_vgs (guestfs_h *g)
@@ -984,39 +884,39 @@ char **guestfs_vgs (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_vgs") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_VGS, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, vgs_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_vgs");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_VGS, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, vgs_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_vgs");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -1029,8 +929,7 @@ struct lvs_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1038,20 +937,12 @@ struct lvs_ctx {
   struct guestfs_lvs_ret ret;
 };
 
-static void lvs_send_cb (guestfs_h *g, void *data)
+static void lvs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvs_ctx *ctx = (struct lvs_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void lvs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct lvs_ctx *ctx = (struct lvs_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_lvs");
@@ -1069,8 +960,7 @@ static void lvs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_lvs (guestfs_h *g)
@@ -1080,39 +970,39 @@ char **guestfs_lvs (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_lvs") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_LVS, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, lvs_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_lvs");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LVS, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, lvs_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvs");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -1125,8 +1015,7 @@ struct pvs_full_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1134,20 +1023,12 @@ struct pvs_full_ctx {
   struct guestfs_pvs_full_ret ret;
 };
 
-static void pvs_full_send_cb (guestfs_h *g, void *data)
+static void pvs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct pvs_full_ctx *ctx = (struct pvs_full_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void pvs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct pvs_full_ctx *ctx = (struct pvs_full_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_pvs_full");
@@ -1165,8 +1046,7 @@ static void pvs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
@@ -1176,39 +1056,39 @@ struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_pvs_full") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_PVS_FULL, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, pvs_full_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_pvs_full");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_PVS_FULL, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, pvs_full_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_pvs_full");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS_FULL, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVS_FULL, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.physvols, sizeof (ctx.ret.physvols));
 }
@@ -1217,8 +1097,7 @@ struct vgs_full_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1226,20 +1105,12 @@ struct vgs_full_ctx {
   struct guestfs_vgs_full_ret ret;
 };
 
-static void vgs_full_send_cb (guestfs_h *g, void *data)
+static void vgs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct vgs_full_ctx *ctx = (struct vgs_full_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void vgs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct vgs_full_ctx *ctx = (struct vgs_full_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_vgs_full");
@@ -1257,8 +1128,7 @@ static void vgs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
@@ -1268,39 +1138,39 @@ struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_vgs_full") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_VGS_FULL, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, vgs_full_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_vgs_full");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_VGS_FULL, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, vgs_full_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_vgs_full");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS_FULL, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGS_FULL, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.volgroups, sizeof (ctx.ret.volgroups));
 }
@@ -1309,8 +1179,7 @@ struct lvs_full_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1318,20 +1187,12 @@ struct lvs_full_ctx {
   struct guestfs_lvs_full_ret ret;
 };
 
-static void lvs_full_send_cb (guestfs_h *g, void *data)
+static void lvs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvs_full_ctx *ctx = (struct lvs_full_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void lvs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct lvs_full_ctx *ctx = (struct lvs_full_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_lvs_full");
@@ -1349,8 +1210,7 @@ static void lvs_full_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
@@ -1360,39 +1220,39 @@ struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_lvs_full") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_LVS_FULL, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, lvs_full_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_lvs_full");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LVS_FULL, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, lvs_full_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvs_full");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS_FULL, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVS_FULL, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.logvols, sizeof (ctx.ret.logvols));
 }
@@ -1401,8 +1261,7 @@ struct read_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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1410,20 +1269,12 @@ struct read_lines_ctx {
   struct guestfs_read_lines_ret ret;
 };
 
-static void read_lines_send_cb (guestfs_h *g, void *data)
+static void read_lines_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct read_lines_ctx *ctx = (struct read_lines_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void read_lines_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct read_lines_ctx *ctx = (struct read_lines_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_read_lines");
@@ -1441,8 +1292,7 @@ static void read_lines_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_read_lines (guestfs_h *g,
@@ -1454,41 +1304,41 @@ char **guestfs_read_lines (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_read_lines") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_READ_LINES,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_READ_LINES,
         (xdrproc_t) xdr_guestfs_read_lines_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, read_lines_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_read_lines");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, read_lines_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_read_lines");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_READ_LINES, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_READ_LINES, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -1501,28 +1351,19 @@ struct aug_init_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void aug_init_send_cb (guestfs_h *g, void *data)
+static void aug_init_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_init_ctx *ctx = (struct aug_init_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_init_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_init_ctx *ctx = (struct aug_init_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_init");
@@ -1536,8 +1377,7 @@ static void aug_init_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_init (guestfs_h *g,
@@ -1550,42 +1390,42 @@ int guestfs_aug_init (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_init") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.root = (char *) root;
   args.flags = flags;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_INIT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_INIT,
         (xdrproc_t) xdr_guestfs_aug_init_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_init_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_init");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_init_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_init");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INIT, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INIT, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -1593,28 +1433,19 @@ struct aug_close_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void aug_close_send_cb (guestfs_h *g, void *data)
+static void aug_close_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_close_ctx *ctx = (struct aug_close_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_close_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_close_ctx *ctx = (struct aug_close_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_close");
@@ -1628,8 +1459,7 @@ static void aug_close_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_close (guestfs_h *g)
@@ -1639,39 +1469,39 @@ int guestfs_aug_close (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_aug_close") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_CLOSE, NULL, NULL);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_close_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_close");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_CLOSE, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_close_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_close");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_CLOSE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_CLOSE, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -1679,8 +1509,7 @@ struct aug_defvar_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1688,20 +1517,12 @@ struct aug_defvar_ctx {
   struct guestfs_aug_defvar_ret ret;
 };
 
-static void aug_defvar_send_cb (guestfs_h *g, void *data)
+static void aug_defvar_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_defvar_ctx *ctx = (struct aug_defvar_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_defvar_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_defvar_ctx *ctx = (struct aug_defvar_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_defvar");
@@ -1719,8 +1540,7 @@ static void aug_defvar_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_defvar (guestfs_h *g,
@@ -1733,42 +1553,42 @@ int guestfs_aug_defvar (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_defvar") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.name = (char *) name;
   args.expr = expr ? (char **) &expr : NULL;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_DEFVAR,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_DEFVAR,
         (xdrproc_t) xdr_guestfs_aug_defvar_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_defvar_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_defvar");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_defvar_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_defvar");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFVAR, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFVAR, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.nrnodes;
 }
 
@@ -1776,8 +1596,7 @@ struct aug_defnode_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1785,20 +1604,12 @@ struct aug_defnode_ctx {
   struct guestfs_aug_defnode_ret ret;
 };
 
-static void aug_defnode_send_cb (guestfs_h *g, void *data)
+static void aug_defnode_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_defnode_ctx *ctx = (struct aug_defnode_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_defnode_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_defnode_ctx *ctx = (struct aug_defnode_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_defnode");
@@ -1816,8 +1627,7 @@ static void aug_defnode_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
@@ -1831,43 +1641,43 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_defnode") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.name = (char *) name;
   args.expr = (char *) expr;
   args.val = (char *) val;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_DEFNODE,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_DEFNODE,
         (xdrproc_t) xdr_guestfs_aug_defnode_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_defnode_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_defnode");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_defnode_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_defnode");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFNODE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_DEFNODE, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   /* caller with free this */
   return safe_memdup (g, &ctx.ret, sizeof (ctx.ret));
 }
@@ -1876,8 +1686,7 @@ struct aug_get_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -1885,20 +1694,12 @@ struct aug_get_ctx {
   struct guestfs_aug_get_ret ret;
 };
 
-static void aug_get_send_cb (guestfs_h *g, void *data)
+static void aug_get_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_get_ctx *ctx = (struct aug_get_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_get_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_get_ctx *ctx = (struct aug_get_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_get");
@@ -1916,8 +1717,7 @@ static void aug_get_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char *guestfs_aug_get (guestfs_h *g,
@@ -1929,41 +1729,41 @@ char *guestfs_aug_get (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_get") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_GET,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_GET,
         (xdrproc_t) xdr_guestfs_aug_get_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_get_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_get");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_get_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_get");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_GET, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_GET, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.val; /* caller will free */
 }
 
@@ -1971,28 +1771,19 @@ struct aug_set_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void aug_set_send_cb (guestfs_h *g, void *data)
+static void aug_set_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_set_ctx *ctx = (struct aug_set_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_set_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_set_ctx *ctx = (struct aug_set_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_set");
@@ -2006,8 +1797,7 @@ static void aug_set_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_set (guestfs_h *g,
@@ -2020,42 +1810,42 @@ int guestfs_aug_set (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_set") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
   args.val = (char *) val;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_SET,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_SET,
         (xdrproc_t) xdr_guestfs_aug_set_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_set_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_set");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_set_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_set");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SET, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SET, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2063,28 +1853,19 @@ struct aug_insert_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void aug_insert_send_cb (guestfs_h *g, void *data)
+static void aug_insert_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_insert_ctx *ctx = (struct aug_insert_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_insert_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_insert_ctx *ctx = (struct aug_insert_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_insert");
@@ -2098,8 +1879,7 @@ static void aug_insert_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_insert (guestfs_h *g,
@@ -2113,43 +1893,43 @@ int guestfs_aug_insert (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_insert") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
   args.label = (char *) label;
   args.before = before;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_INSERT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_INSERT,
         (xdrproc_t) xdr_guestfs_aug_insert_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_insert_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_insert");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_insert_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_insert");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INSERT, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_INSERT, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2157,8 +1937,7 @@ struct aug_rm_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -2166,20 +1945,12 @@ struct aug_rm_ctx {
   struct guestfs_aug_rm_ret ret;
 };
 
-static void aug_rm_send_cb (guestfs_h *g, void *data)
+static void aug_rm_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_rm_ctx *ctx = (struct aug_rm_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_rm_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_rm_ctx *ctx = (struct aug_rm_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_rm");
@@ -2197,8 +1968,7 @@ static void aug_rm_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_rm (guestfs_h *g,
@@ -2210,41 +1980,41 @@ int guestfs_aug_rm (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_rm") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_RM,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_RM,
         (xdrproc_t) xdr_guestfs_aug_rm_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_rm_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_rm");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_rm_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_rm");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_RM, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_RM, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.nrnodes;
 }
 
@@ -2252,28 +2022,19 @@ struct aug_mv_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void aug_mv_send_cb (guestfs_h *g, void *data)
+static void aug_mv_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_mv_ctx *ctx = (struct aug_mv_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_mv_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_mv_ctx *ctx = (struct aug_mv_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_mv");
@@ -2287,8 +2048,7 @@ static void aug_mv_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_mv (guestfs_h *g,
@@ -2301,42 +2061,42 @@ int guestfs_aug_mv (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_mv") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.src = (char *) src;
   args.dest = (char *) dest;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_MV,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_MV,
         (xdrproc_t) xdr_guestfs_aug_mv_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_mv_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_mv");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_mv_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_mv");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MV, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MV, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2344,8 +2104,7 @@ struct aug_match_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -2353,20 +2112,12 @@ struct aug_match_ctx {
   struct guestfs_aug_match_ret ret;
 };
 
-static void aug_match_send_cb (guestfs_h *g, void *data)
+static void aug_match_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_match_ctx *ctx = (struct aug_match_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_match_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_match_ctx *ctx = (struct aug_match_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_match");
@@ -2384,8 +2135,7 @@ static void aug_match_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_aug_match (guestfs_h *g,
@@ -2397,41 +2147,41 @@ char **guestfs_aug_match (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_match") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_MATCH,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_MATCH,
         (xdrproc_t) xdr_guestfs_aug_match_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_match_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_match");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_match_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_match");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MATCH, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_MATCH, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -2444,28 +2194,19 @@ struct aug_save_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void aug_save_send_cb (guestfs_h *g, void *data)
+static void aug_save_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_save_ctx *ctx = (struct aug_save_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_save_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_save_ctx *ctx = (struct aug_save_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_save");
@@ -2479,8 +2220,7 @@ static void aug_save_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_save (guestfs_h *g)
@@ -2490,39 +2230,39 @@ int guestfs_aug_save (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_aug_save") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_SAVE, NULL, NULL);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_save_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_save");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_SAVE, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_save_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_save");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SAVE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_SAVE, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2530,28 +2270,19 @@ struct aug_load_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void aug_load_send_cb (guestfs_h *g, void *data)
+static void aug_load_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_load_ctx *ctx = (struct aug_load_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_load_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_load_ctx *ctx = (struct aug_load_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_load");
@@ -2565,8 +2296,7 @@ static void aug_load_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_aug_load (guestfs_h *g)
@@ -2576,39 +2306,39 @@ int guestfs_aug_load (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_aug_load") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_LOAD, NULL, NULL);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_load_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_load");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_LOAD, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_load_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_load");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LOAD, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LOAD, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2616,8 +2346,7 @@ struct aug_ls_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -2625,20 +2354,12 @@ struct aug_ls_ctx {
   struct guestfs_aug_ls_ret ret;
 };
 
-static void aug_ls_send_cb (guestfs_h *g, void *data)
+static void aug_ls_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_ls_ctx *ctx = (struct aug_ls_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void aug_ls_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct aug_ls_ctx *ctx = (struct aug_ls_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_aug_ls");
@@ -2656,8 +2377,7 @@ static void aug_ls_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_aug_ls (guestfs_h *g,
@@ -2669,41 +2389,41 @@ char **guestfs_aug_ls (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_aug_ls") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_AUG_LS,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_AUG_LS,
         (xdrproc_t) xdr_guestfs_aug_ls_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, aug_ls_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_aug_ls");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, aug_ls_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_aug_ls");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_AUG_LS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -2716,28 +2436,19 @@ struct rm_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void rm_send_cb (guestfs_h *g, void *data)
+static void rm_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct rm_ctx *ctx = (struct rm_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void rm_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct rm_ctx *ctx = (struct rm_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_rm");
@@ -2751,8 +2462,7 @@ static void rm_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_rm (guestfs_h *g,
@@ -2764,41 +2474,41 @@ int guestfs_rm (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_rm") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_RM,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_RM,
         (xdrproc_t) xdr_guestfs_rm_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, rm_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_rm");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, rm_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_rm");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2806,28 +2516,19 @@ struct rmdir_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void rmdir_send_cb (guestfs_h *g, void *data)
+static void rmdir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct rmdir_ctx *ctx = (struct rmdir_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void rmdir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct rmdir_ctx *ctx = (struct rmdir_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_rmdir");
@@ -2841,8 +2542,7 @@ static void rmdir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_rmdir (guestfs_h *g,
@@ -2854,41 +2554,41 @@ int guestfs_rmdir (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_rmdir") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_RMDIR,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_RMDIR,
         (xdrproc_t) xdr_guestfs_rmdir_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, rmdir_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_rmdir");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, rmdir_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_rmdir");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RMDIR, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RMDIR, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2896,28 +2596,19 @@ struct rm_rf_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void rm_rf_send_cb (guestfs_h *g, void *data)
+static void rm_rf_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct rm_rf_ctx *ctx = (struct rm_rf_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void rm_rf_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct rm_rf_ctx *ctx = (struct rm_rf_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_rm_rf");
@@ -2931,8 +2622,7 @@ static void rm_rf_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_rm_rf (guestfs_h *g,
@@ -2944,41 +2634,41 @@ int guestfs_rm_rf (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_rm_rf") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_RM_RF,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_RM_RF,
         (xdrproc_t) xdr_guestfs_rm_rf_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, rm_rf_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_rm_rf");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, rm_rf_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_rm_rf");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM_RF, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_RM_RF, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -2986,28 +2676,19 @@ struct mkdir_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void mkdir_send_cb (guestfs_h *g, void *data)
+static void mkdir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mkdir_ctx *ctx = (struct mkdir_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void mkdir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct mkdir_ctx *ctx = (struct mkdir_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_mkdir");
@@ -3021,8 +2702,7 @@ static void mkdir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_mkdir (guestfs_h *g,
@@ -3034,41 +2714,41 @@ int guestfs_mkdir (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_mkdir") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_MKDIR,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKDIR,
         (xdrproc_t) xdr_guestfs_mkdir_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, mkdir_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_mkdir");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, mkdir_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mkdir");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -3076,28 +2756,19 @@ struct mkdir_p_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void mkdir_p_send_cb (guestfs_h *g, void *data)
+static void mkdir_p_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mkdir_p_ctx *ctx = (struct mkdir_p_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void mkdir_p_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct mkdir_p_ctx *ctx = (struct mkdir_p_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_mkdir_p");
@@ -3111,8 +2782,7 @@ static void mkdir_p_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_mkdir_p (guestfs_h *g,
@@ -3124,41 +2794,41 @@ int guestfs_mkdir_p (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_mkdir_p") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_MKDIR_P,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKDIR_P,
         (xdrproc_t) xdr_guestfs_mkdir_p_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, mkdir_p_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_mkdir_p");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, mkdir_p_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mkdir_p");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR_P, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKDIR_P, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -3166,28 +2836,19 @@ struct chmod_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void chmod_send_cb (guestfs_h *g, void *data)
+static void chmod_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct chmod_ctx *ctx = (struct chmod_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void chmod_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct chmod_ctx *ctx = (struct chmod_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_chmod");
@@ -3201,8 +2862,7 @@ static void chmod_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_chmod (guestfs_h *g,
@@ -3215,42 +2875,42 @@ int guestfs_chmod (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_chmod") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.mode = mode;
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_CHMOD,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_CHMOD,
         (xdrproc_t) xdr_guestfs_chmod_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, chmod_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_chmod");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, chmod_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_chmod");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHMOD, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHMOD, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -3258,28 +2918,19 @@ struct chown_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void chown_send_cb (guestfs_h *g, void *data)
+static void chown_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct chown_ctx *ctx = (struct chown_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void chown_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct chown_ctx *ctx = (struct chown_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_chown");
@@ -3293,8 +2944,7 @@ static void chown_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_chown (guestfs_h *g,
@@ -3308,43 +2958,43 @@ int guestfs_chown (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_chown") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.owner = owner;
   args.group = group;
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_CHOWN,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_CHOWN,
         (xdrproc_t) xdr_guestfs_chown_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, chown_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_chown");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, chown_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_chown");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHOWN, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHOWN, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -3352,8 +3002,7 @@ struct exists_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -3361,20 +3010,12 @@ struct exists_ctx {
   struct guestfs_exists_ret ret;
 };
 
-static void exists_send_cb (guestfs_h *g, void *data)
+static void exists_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct exists_ctx *ctx = (struct exists_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void exists_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct exists_ctx *ctx = (struct exists_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_exists");
@@ -3392,8 +3033,7 @@ static void exists_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_exists (guestfs_h *g,
@@ -3405,41 +3045,41 @@ int guestfs_exists (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_exists") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_EXISTS,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_EXISTS,
         (xdrproc_t) xdr_guestfs_exists_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, exists_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_exists");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, exists_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_exists");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_EXISTS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_EXISTS, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.existsflag;
 }
 
@@ -3447,8 +3087,7 @@ struct is_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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -3456,20 +3095,12 @@ struct is_file_ctx {
   struct guestfs_is_file_ret ret;
 };
 
-static void is_file_send_cb (guestfs_h *g, void *data)
+static void is_file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct is_file_ctx *ctx = (struct is_file_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void is_file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct is_file_ctx *ctx = (struct is_file_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_is_file");
@@ -3487,8 +3118,7 @@ static void is_file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_is_file (guestfs_h *g,
@@ -3500,41 +3130,41 @@ int guestfs_is_file (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_is_file") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_IS_FILE,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_IS_FILE,
         (xdrproc_t) xdr_guestfs_is_file_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, is_file_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_is_file");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, is_file_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_is_file");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_FILE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_FILE, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.fileflag;
 }
 
@@ -3542,8 +3172,7 @@ struct is_dir_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -3551,20 +3180,12 @@ struct is_dir_ctx {
   struct guestfs_is_dir_ret ret;
 };
 
-static void is_dir_send_cb (guestfs_h *g, void *data)
+static void is_dir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct is_dir_ctx *ctx = (struct is_dir_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void is_dir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct is_dir_ctx *ctx = (struct is_dir_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_is_dir");
@@ -3582,8 +3203,7 @@ static void is_dir_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_is_dir (guestfs_h *g,
@@ -3595,41 +3215,41 @@ int guestfs_is_dir (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_is_dir") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_IS_DIR,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_IS_DIR,
         (xdrproc_t) xdr_guestfs_is_dir_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, is_dir_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_is_dir");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, is_dir_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_is_dir");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_DIR, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_IS_DIR, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.dirflag;
 }
 
@@ -3637,28 +3257,19 @@ struct pvcreate_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void pvcreate_send_cb (guestfs_h *g, void *data)
+static void pvcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct pvcreate_ctx *ctx = (struct pvcreate_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void pvcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct pvcreate_ctx *ctx = (struct pvcreate_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_pvcreate");
@@ -3672,8 +3283,7 @@ static void pvcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_pvcreate (guestfs_h *g,
@@ -3685,41 +3295,41 @@ int guestfs_pvcreate (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_pvcreate") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_PVCREATE,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_PVCREATE,
         (xdrproc_t) xdr_guestfs_pvcreate_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, pvcreate_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_pvcreate");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, pvcreate_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_pvcreate");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVCREATE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVCREATE, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -3727,28 +3337,19 @@ struct vgcreate_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void vgcreate_send_cb (guestfs_h *g, void *data)
+static void vgcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct vgcreate_ctx *ctx = (struct vgcreate_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void vgcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct vgcreate_ctx *ctx = (struct vgcreate_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_vgcreate");
@@ -3762,8 +3363,7 @@ static void vgcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_vgcreate (guestfs_h *g,
@@ -3776,43 +3376,43 @@ int guestfs_vgcreate (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_vgcreate") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.volgroup = (char *) volgroup;
   args.physvols.physvols_val = (char **) physvols;
   for (args.physvols.physvols_len = 0; physvols[args.physvols.physvols_len]; args.physvols.physvols_len++) ;
-  serial = guestfs__send (g, GUESTFS_PROC_VGCREATE,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_VGCREATE,
         (xdrproc_t) xdr_guestfs_vgcreate_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, vgcreate_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_vgcreate");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, vgcreate_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_vgcreate");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGCREATE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGCREATE, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -3820,28 +3420,19 @@ struct lvcreate_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void lvcreate_send_cb (guestfs_h *g, void *data)
+static void lvcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvcreate_ctx *ctx = (struct lvcreate_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void lvcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct lvcreate_ctx *ctx = (struct lvcreate_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_lvcreate");
@@ -3855,8 +3446,7 @@ static void lvcreate_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_lvcreate (guestfs_h *g,
@@ -3870,43 +3460,43 @@ int guestfs_lvcreate (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_lvcreate") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.logvol = (char *) logvol;
   args.volgroup = (char *) volgroup;
   args.mbytes = mbytes;
-  serial = guestfs__send (g, GUESTFS_PROC_LVCREATE,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LVCREATE,
         (xdrproc_t) xdr_guestfs_lvcreate_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, lvcreate_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_lvcreate");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, lvcreate_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvcreate");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVCREATE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVCREATE, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -3914,28 +3504,19 @@ struct mkfs_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void mkfs_send_cb (guestfs_h *g, void *data)
+static void mkfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mkfs_ctx *ctx = (struct mkfs_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void mkfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct mkfs_ctx *ctx = (struct mkfs_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_mkfs");
@@ -3949,8 +3530,7 @@ static void mkfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_mkfs (guestfs_h *g,
@@ -3963,42 +3543,42 @@ int guestfs_mkfs (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_mkfs") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.fstype = (char *) fstype;
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_MKFS,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MKFS,
         (xdrproc_t) xdr_guestfs_mkfs_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, mkfs_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_mkfs");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, mkfs_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mkfs");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKFS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MKFS, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -4006,28 +3586,19 @@ struct sfdisk_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void sfdisk_send_cb (guestfs_h *g, void *data)
+static void sfdisk_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct sfdisk_ctx *ctx = (struct sfdisk_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void sfdisk_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct sfdisk_ctx *ctx = (struct sfdisk_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_sfdisk");
@@ -4041,8 +3612,7 @@ static void sfdisk_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_sfdisk (guestfs_h *g,
@@ -4058,6 +3628,7 @@ int guestfs_sfdisk (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_sfdisk") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
@@ -4067,37 +3638,36 @@ int guestfs_sfdisk (guestfs_h *g,
   args.sectors = sectors;
   args.lines.lines_val = (char **) lines;
   for (args.lines.lines_len = 0; lines[args.lines.lines_len]; args.lines.lines_len++) ;
-  serial = guestfs__send (g, GUESTFS_PROC_SFDISK,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_SFDISK,
         (xdrproc_t) xdr_guestfs_sfdisk_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, sfdisk_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_sfdisk");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, sfdisk_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_sfdisk");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_SFDISK, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -4105,28 +3675,19 @@ struct write_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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void write_file_send_cb (guestfs_h *g, void *data)
+static void write_file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct write_file_ctx *ctx = (struct write_file_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void write_file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct write_file_ctx *ctx = (struct write_file_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_write_file");
@@ -4140,8 +3701,7 @@ static void write_file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_write_file (guestfs_h *g,
@@ -4155,43 +3715,43 @@ int guestfs_write_file (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_write_file") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
   args.content = (char *) content;
   args.size = size;
-  serial = guestfs__send (g, GUESTFS_PROC_WRITE_FILE,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_WRITE_FILE,
         (xdrproc_t) xdr_guestfs_write_file_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, write_file_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_write_file");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, write_file_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_write_file");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WRITE_FILE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_WRITE_FILE, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -4199,28 +3759,19 @@ struct umount_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void umount_send_cb (guestfs_h *g, void *data)
+static void umount_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct umount_ctx *ctx = (struct umount_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void umount_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct umount_ctx *ctx = (struct umount_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_umount");
@@ -4234,8 +3785,7 @@ static void umount_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_umount (guestfs_h *g,
@@ -4247,41 +3797,41 @@ int guestfs_umount (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_umount") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.pathordevice = (char *) pathordevice;
-  serial = guestfs__send (g, GUESTFS_PROC_UMOUNT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_UMOUNT,
         (xdrproc_t) xdr_guestfs_umount_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, umount_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_umount");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, umount_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_umount");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -4289,8 +3839,7 @@ struct mounts_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -4298,20 +3847,12 @@ struct mounts_ctx {
   struct guestfs_mounts_ret ret;
 };
 
-static void mounts_send_cb (guestfs_h *g, void *data)
+static void mounts_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mounts_ctx *ctx = (struct mounts_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void mounts_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct mounts_ctx *ctx = (struct mounts_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_mounts");
@@ -4329,8 +3870,7 @@ static void mounts_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_mounts (guestfs_h *g)
@@ -4340,39 +3880,39 @@ char **guestfs_mounts (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_mounts") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_MOUNTS, NULL, NULL);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, mounts_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_mounts");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNTS, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, mounts_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_mounts");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNTS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNTS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -4385,28 +3925,19 @@ struct umount_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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void umount_all_send_cb (guestfs_h *g, void *data)
+static void umount_all_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct umount_all_ctx *ctx = (struct umount_all_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void umount_all_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct umount_all_ctx *ctx = (struct umount_all_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_umount_all");
@@ -4420,8 +3951,7 @@ static void umount_all_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_umount_all (guestfs_h *g)
@@ -4431,39 +3961,39 @@ int guestfs_umount_all (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_umount_all") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_UMOUNT_ALL, NULL, NULL);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, umount_all_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_umount_all");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_UMOUNT_ALL, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, umount_all_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_umount_all");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT_ALL, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UMOUNT_ALL, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -4471,28 +4001,19 @@ struct lvm_remove_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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void lvm_remove_all_send_cb (guestfs_h *g, void *data)
+static void lvm_remove_all_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvm_remove_all_ctx *ctx = (struct lvm_remove_all_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void lvm_remove_all_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct lvm_remove_all_ctx *ctx = (struct lvm_remove_all_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_lvm_remove_all");
@@ -4506,8 +4027,7 @@ static void lvm_remove_all_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_lvm_remove_all (guestfs_h *g)
@@ -4517,39 +4037,39 @@ int guestfs_lvm_remove_all (guestfs_h *g)
   int serial;
 
   if (check_state (g, "guestfs_lvm_remove_all") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
-  serial = guestfs__send (g, GUESTFS_PROC_LVM_REMOVE_ALL, NULL, NULL);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, lvm_remove_all_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_lvm_remove_all");
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LVM_REMOVE_ALL, NULL, NULL);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, lvm_remove_all_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lvm_remove_all");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVM_REMOVE_ALL, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVM_REMOVE_ALL, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -4557,8 +4077,7 @@ struct 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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -4566,20 +4085,12 @@ struct file_ctx {
   struct guestfs_file_ret ret;
 };
 
-static void file_send_cb (guestfs_h *g, void *data)
+static void file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct file_ctx *ctx = (struct file_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct file_ctx *ctx = (struct file_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_file");
@@ -4597,8 +4108,7 @@ static void file_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char *guestfs_file (guestfs_h *g,
@@ -4610,41 +4120,41 @@ char *guestfs_file (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_file") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_FILE,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_FILE,
         (xdrproc_t) xdr_guestfs_file_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, file_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_file");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, file_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_file");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_FILE, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_FILE, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.description; /* caller will free */
 }
 
@@ -4652,8 +4162,7 @@ struct command_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -4661,20 +4170,12 @@ struct command_ctx {
   struct guestfs_command_ret ret;
 };
 
-static void command_send_cb (guestfs_h *g, void *data)
+static void command_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct command_ctx *ctx = (struct command_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void command_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct command_ctx *ctx = (struct command_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_command");
@@ -4692,8 +4193,7 @@ static void command_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char *guestfs_command (guestfs_h *g,
@@ -4705,42 +4205,42 @@ char *guestfs_command (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_command") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.arguments.arguments_val = (char **) arguments;
   for (args.arguments.arguments_len = 0; arguments[args.arguments.arguments_len]; args.arguments.arguments_len++) ;
-  serial = guestfs__send (g, GUESTFS_PROC_COMMAND,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_COMMAND,
         (xdrproc_t) xdr_guestfs_command_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, command_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_command");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, command_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_command");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.output; /* caller will free */
 }
 
@@ -4748,8 +4248,7 @@ struct command_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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -4757,20 +4256,12 @@ struct command_lines_ctx {
   struct guestfs_command_lines_ret ret;
 };
 
-static void command_lines_send_cb (guestfs_h *g, void *data)
+static void command_lines_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct command_lines_ctx *ctx = (struct command_lines_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void command_lines_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct command_lines_ctx *ctx = (struct command_lines_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_command_lines");
@@ -4788,8 +4279,7 @@ static void command_lines_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_command_lines (guestfs_h *g,
@@ -4801,42 +4291,42 @@ char **guestfs_command_lines (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_command_lines") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.arguments.arguments_val = (char **) arguments;
   for (args.arguments.arguments_len = 0; arguments[args.arguments.arguments_len]; args.arguments.arguments_len++) ;
-  serial = guestfs__send (g, GUESTFS_PROC_COMMAND_LINES,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_COMMAND_LINES,
         (xdrproc_t) xdr_guestfs_command_lines_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, command_lines_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_command_lines");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, command_lines_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_command_lines");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND_LINES, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_COMMAND_LINES, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -4849,8 +4339,7 @@ struct stat_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -4858,20 +4347,12 @@ struct stat_ctx {
   struct guestfs_stat_ret ret;
 };
 
-static void stat_send_cb (guestfs_h *g, void *data)
+static void stat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct stat_ctx *ctx = (struct stat_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void stat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct stat_ctx *ctx = (struct stat_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_stat");
@@ -4889,8 +4370,7 @@ static void stat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 struct guestfs_stat *guestfs_stat (guestfs_h *g,
@@ -4902,41 +4382,41 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_stat") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_STAT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_STAT,
         (xdrproc_t) xdr_guestfs_stat_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, stat_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_stat");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, stat_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_stat");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STAT, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STAT, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf));
 }
@@ -4945,8 +4425,7 @@ struct lstat_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -4954,20 +4433,12 @@ struct lstat_ctx {
   struct guestfs_lstat_ret ret;
 };
 
-static void lstat_send_cb (guestfs_h *g, void *data)
+static void lstat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lstat_ctx *ctx = (struct lstat_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void lstat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct lstat_ctx *ctx = (struct lstat_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_lstat");
@@ -4985,8 +4456,7 @@ static void lstat_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 struct guestfs_stat *guestfs_lstat (guestfs_h *g,
@@ -4998,41 +4468,41 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_lstat") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_LSTAT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LSTAT,
         (xdrproc_t) xdr_guestfs_lstat_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, lstat_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_lstat");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, lstat_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_lstat");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LSTAT, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LSTAT, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf));
 }
@@ -5041,8 +4511,7 @@ struct statvfs_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -5050,20 +4519,12 @@ struct statvfs_ctx {
   struct guestfs_statvfs_ret ret;
 };
 
-static void statvfs_send_cb (guestfs_h *g, void *data)
+static void statvfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct statvfs_ctx *ctx = (struct statvfs_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void statvfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct statvfs_ctx *ctx = (struct statvfs_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_statvfs");
@@ -5081,8 +4542,7 @@ static void statvfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
@@ -5094,41 +4554,41 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_statvfs") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.path = (char *) path;
-  serial = guestfs__send (g, GUESTFS_PROC_STATVFS,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_STATVFS,
         (xdrproc_t) xdr_guestfs_statvfs_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, statvfs_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_statvfs");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, statvfs_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_statvfs");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STATVFS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STATVFS, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (g);
   /* caller will free this */
   return safe_memdup (g, &ctx.ret.statbuf, sizeof (ctx.ret.statbuf));
 }
@@ -5137,8 +4597,7 @@ struct tune2fs_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 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -5146,20 +4605,12 @@ struct tune2fs_l_ctx {
   struct guestfs_tune2fs_l_ret ret;
 };
 
-static void tune2fs_l_send_cb (guestfs_h *g, void *data)
+static void tune2fs_l_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct tune2fs_l_ctx *ctx = (struct tune2fs_l_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void tune2fs_l_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct tune2fs_l_ctx *ctx = (struct tune2fs_l_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_tune2fs_l");
@@ -5177,8 +4628,7 @@ static void tune2fs_l_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 char **guestfs_tune2fs_l (guestfs_h *g,
@@ -5190,41 +4640,41 @@ char **guestfs_tune2fs_l (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_tune2fs_l") == -1) return NULL;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_TUNE2FS_L,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_TUNE2FS_L,
         (xdrproc_t) xdr_guestfs_tune2fs_l_args, (char *) &args);
-  if (serial == -1)
-    return NULL;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, tune2fs_l_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_tune2fs_l");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, tune2fs_l_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_tune2fs_l");
+    guestfs_set_ready (g);
     return NULL;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TUNE2FS_L, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TUNE2FS_L, serial) == -1) {
+    guestfs_set_ready (g);
     return NULL;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return NULL;
   }
 
+  guestfs_set_ready (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,
@@ -5237,28 +4687,19 @@ struct blockdev_setro_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void blockdev_setro_send_cb (guestfs_h *g, void *data)
+static void blockdev_setro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_setro_ctx *ctx = (struct blockdev_setro_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_setro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_setro_ctx *ctx = (struct blockdev_setro_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_setro");
@@ -5272,8 +4713,7 @@ static void blockdev_setro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_setro (guestfs_h *g,
@@ -5285,41 +4725,41 @@ int guestfs_blockdev_setro (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_setro") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_SETRO,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETRO,
         (xdrproc_t) xdr_guestfs_blockdev_setro_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_setro_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_setro");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_setro_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setro");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRO, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRO, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -5327,28 +4767,19 @@ struct blockdev_setrw_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void blockdev_setrw_send_cb (guestfs_h *g, void *data)
+static void blockdev_setrw_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_setrw_ctx *ctx = (struct blockdev_setrw_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_setrw_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_setrw_ctx *ctx = (struct blockdev_setrw_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_setrw");
@@ -5362,8 +4793,7 @@ static void blockdev_setrw_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_setrw (guestfs_h *g,
@@ -5375,41 +4805,41 @@ int guestfs_blockdev_setrw (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_setrw") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_SETRW,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETRW,
         (xdrproc_t) xdr_guestfs_blockdev_setrw_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_setrw_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_setrw");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_setrw_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setrw");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRW, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETRW, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -5417,8 +4847,7 @@ struct blockdev_getro_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -5426,20 +4855,12 @@ struct blockdev_getro_ctx {
   struct guestfs_blockdev_getro_ret ret;
 };
 
-static void blockdev_getro_send_cb (guestfs_h *g, void *data)
+static void blockdev_getro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getro_ctx *ctx = (struct blockdev_getro_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_getro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_getro_ctx *ctx = (struct blockdev_getro_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_getro");
@@ -5457,8 +4878,7 @@ static void blockdev_getro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_getro (guestfs_h *g,
@@ -5470,41 +4890,41 @@ int guestfs_blockdev_getro (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_getro") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_GETRO,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETRO,
         (xdrproc_t) xdr_guestfs_blockdev_getro_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_getro_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_getro");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_getro_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getro");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETRO, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETRO, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.ro;
 }
 
@@ -5512,8 +4932,7 @@ struct blockdev_getss_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -5521,20 +4940,12 @@ struct blockdev_getss_ctx {
   struct guestfs_blockdev_getss_ret ret;
 };
 
-static void blockdev_getss_send_cb (guestfs_h *g, void *data)
+static void blockdev_getss_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getss_ctx *ctx = (struct blockdev_getss_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_getss_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_getss_ctx *ctx = (struct blockdev_getss_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_getss");
@@ -5552,8 +4963,7 @@ static void blockdev_getss_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_getss (guestfs_h *g,
@@ -5565,41 +4975,41 @@ int guestfs_blockdev_getss (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_getss") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_GETSS,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSS,
         (xdrproc_t) xdr_guestfs_blockdev_getss_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_getss_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_getss");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_getss_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getss");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSS, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.sectorsize;
 }
 
@@ -5607,8 +5017,7 @@ struct blockdev_getbsz_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -5616,20 +5025,12 @@ struct blockdev_getbsz_ctx {
   struct guestfs_blockdev_getbsz_ret ret;
 };
 
-static void blockdev_getbsz_send_cb (guestfs_h *g, void *data)
+static void blockdev_getbsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getbsz_ctx *ctx = (struct blockdev_getbsz_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_getbsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_getbsz_ctx *ctx = (struct blockdev_getbsz_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_getbsz");
@@ -5647,8 +5048,7 @@ static void blockdev_getbsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_getbsz (guestfs_h *g,
@@ -5660,41 +5060,41 @@ int guestfs_blockdev_getbsz (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_getbsz") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_GETBSZ,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETBSZ,
         (xdrproc_t) xdr_guestfs_blockdev_getbsz_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_getbsz_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_getbsz");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_getbsz_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getbsz");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETBSZ, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETBSZ, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.blocksize;
 }
 
@@ -5702,28 +5102,19 @@ struct blockdev_setbsz_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void blockdev_setbsz_send_cb (guestfs_h *g, void *data)
+static void blockdev_setbsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_setbsz_ctx *ctx = (struct blockdev_setbsz_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_setbsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_setbsz_ctx *ctx = (struct blockdev_setbsz_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_setbsz");
@@ -5737,8 +5128,7 @@ static void blockdev_setbsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_setbsz (guestfs_h *g,
@@ -5751,42 +5141,42 @@ int guestfs_blockdev_setbsz (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_setbsz") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
   args.blocksize = blocksize;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_SETBSZ,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_SETBSZ,
         (xdrproc_t) xdr_guestfs_blockdev_setbsz_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_setbsz_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_setbsz");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_setbsz_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_setbsz");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETBSZ, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_SETBSZ, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -5794,8 +5184,7 @@ struct blockdev_getsz_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -5803,20 +5192,12 @@ struct blockdev_getsz_ctx {
   struct guestfs_blockdev_getsz_ret ret;
 };
 
-static void blockdev_getsz_send_cb (guestfs_h *g, void *data)
+static void blockdev_getsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getsz_ctx *ctx = (struct blockdev_getsz_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_getsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_getsz_ctx *ctx = (struct blockdev_getsz_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_getsz");
@@ -5834,8 +5215,7 @@ static void blockdev_getsz_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int64_t guestfs_blockdev_getsz (guestfs_h *g,
@@ -5847,41 +5227,41 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_getsz") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_GETSZ,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSZ,
         (xdrproc_t) xdr_guestfs_blockdev_getsz_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_getsz_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_getsz");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_getsz_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getsz");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSZ, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSZ, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.sizeinsectors;
 }
 
@@ -5889,8 +5269,7 @@ struct blockdev_getsize64_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
@@ -5898,20 +5277,12 @@ struct blockdev_getsize64_ctx {
   struct guestfs_blockdev_getsize64_ret ret;
 };
 
-static void blockdev_getsize64_send_cb (guestfs_h *g, void *data)
+static void blockdev_getsize64_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getsize64_ctx *ctx = (struct blockdev_getsize64_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_getsize64_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_getsize64_ctx *ctx = (struct blockdev_getsize64_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_getsize64");
@@ -5929,8 +5300,7 @@ static void blockdev_getsize64_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
@@ -5942,41 +5312,41 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_getsize64") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_GETSIZE64,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_GETSIZE64,
         (xdrproc_t) xdr_guestfs_blockdev_getsize64_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_getsize64_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_getsize64");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_getsize64_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_getsize64");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSIZE64, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_GETSIZE64, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return ctx.ret.sizeinbytes;
 }
 
@@ -5984,28 +5354,19 @@ struct blockdev_flushbufs_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void blockdev_flushbufs_send_cb (guestfs_h *g, void *data)
+static void blockdev_flushbufs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_flushbufs_ctx *ctx = (struct blockdev_flushbufs_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_flushbufs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_flushbufs_ctx *ctx = (struct blockdev_flushbufs_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_flushbufs");
@@ -6019,8 +5380,7 @@ static void blockdev_flushbufs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_flushbufs (guestfs_h *g,
@@ -6032,41 +5392,41 @@ int guestfs_blockdev_flushbufs (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_flushbufs") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS,
         (xdrproc_t) xdr_guestfs_blockdev_flushbufs_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_flushbufs_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_flushbufs");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_flushbufs_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_flushbufs");
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS, serial) == -1)
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS, serial) == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }
 
@@ -6074,28 +5434,19 @@ struct blockdev_rereadpt_ctx {
   /* This flag is set by the callbacks, so we know we've done
    * the callbacks as expected, and in the right sequence.
    * 0 = not called, 1 = send called,
-   * 2.. = send_file called,
-   * 1000 = reply called.
+   * 1001 = reply called.
    */
   int cb_sequence;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
-static void blockdev_rereadpt_send_cb (guestfs_h *g, void *data)
+static void blockdev_rereadpt_reply_cb (guestfs_h *g, void *data, XDR *xdr)
 {
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_rereadpt_ctx *ctx = (struct blockdev_rereadpt_ctx *) data;
 
-  guestfs__switch_to_receiving (g);
-  ctx->cb_sequence = 1;
   ml->main_loop_quit (ml, g);
-}
-
-static void blockdev_rereadpt_reply_cb (guestfs_h *g, void *data, XDR *xdr)
-{
-  guestfs_main_loop *ml = guestfs_get_main_loop (g);
-  struct blockdev_rereadpt_ctx *ctx = (struct blockdev_rereadpt_ctx *) data;
 
   if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
     error (g, "%s: failed to parse reply header", "guestfs_blockdev_rereadpt");
@@ -6109,8 +5460,7 @@ static void blockdev_rereadpt_reply_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  ctx->cb_sequence = 1000;
-  ml->main_loop_quit (ml, g);
+  ctx->cb_sequence = 1001;
 }
 
 int guestfs_blockdev_rereadpt (guestfs_h *g,
@@ -6122,41 +5472,1248 @@ int guestfs_blockdev_rereadpt (guestfs_h *g,
   int serial;
 
   if (check_state (g, "guestfs_blockdev_rereadpt") == -1) return -1;
+  guestfs_set_busy (g);
 
   memset (&ctx, 0, sizeof ctx);
 
   args.device = (char *) device;
-  serial = guestfs__send (g, GUESTFS_PROC_BLOCKDEV_REREADPT,
+  serial = guestfs__send_sync (g, GUESTFS_PROC_BLOCKDEV_REREADPT,
         (xdrproc_t) xdr_guestfs_blockdev_rereadpt_args, (char *) &args);
-  if (serial == -1)
-    return -1;
-
-  ctx.cb_sequence = 0;
-  guestfs_set_send_callback (g, blockdev_rereadpt_send_cb, &ctx);
-  (void) ml->main_loop_run (ml, g);
-  guestfs_set_send_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1) {
-    error (g, "%s send failed, see earlier error messages", "guestfs_blockdev_rereadpt");
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs__switch_to_receiving (g);
   ctx.cb_sequence = 0;
   guestfs_set_reply_callback (g, blockdev_rereadpt_reply_cb, &ctx);
   (void) ml->main_loop_run (ml, g);
   guestfs_set_reply_callback (g, NULL, NULL);
-  if (ctx.cb_sequence != 1000) {
+  if (ctx.cb_sequence != 1001) {
     error (g, "%s reply failed, see earlier error messages", "guestfs_blockdev_rereadpt");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_REREADPT, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
-  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_BLOCKDEV_REREADPT, serial) == -1)
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct upload_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void upload_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct upload_ctx *ctx = (struct upload_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_upload");
+    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_upload");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_upload (guestfs_h *g,
+		const char *filename,
+		const char *remotefilename)
+{
+  struct guestfs_upload_args args;
+  struct upload_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_upload") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.remotefilename = (char *) remotefilename;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_UPLOAD,
+        (xdrproc_t) xdr_guestfs_upload_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
     return -1;
+  }
+
+  {
+    int r;
+
+    r = guestfs__send_file_sync (g, filename);
+    if (r == -1) {
+      guestfs_set_ready (g);
+      return -1;
+    }
+    if (r == -2) /* daemon cancelled */
+      goto read_reply;
+  }
+
+ read_reply:
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, upload_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_upload");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_UPLOAD, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct download_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void download_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct download_ctx *ctx = (struct download_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_download");
+    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_download");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_download (guestfs_h *g,
+		const char *remotefilename,
+		const char *filename)
+{
+  struct guestfs_download_args args;
+  struct download_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_download") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.remotefilename = (char *) remotefilename;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_DOWNLOAD,
+        (xdrproc_t) xdr_guestfs_download_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, download_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_download");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DOWNLOAD, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (guestfs__receive_file_sync (g, filename) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct checksum_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_checksum_ret ret;
+};
+
+static void checksum_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct checksum_ctx *ctx = (struct checksum_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_checksum");
+    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_checksum");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_checksum_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_checksum");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+char *guestfs_checksum (guestfs_h *g,
+		const char *csumtype,
+		const char *path)
+{
+  struct guestfs_checksum_args args;
+  struct checksum_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_checksum") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.csumtype = (char *) csumtype;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_CHECKSUM,
+        (xdrproc_t) xdr_guestfs_checksum_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, checksum_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_checksum");
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_CHECKSUM, serial) == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs_set_ready (g);
+  return ctx.ret.checksum; /* caller will free */
+}
+
+struct tar_in_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void tar_in_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct tar_in_ctx *ctx = (struct tar_in_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_tar_in");
+    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_tar_in");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_tar_in (guestfs_h *g,
+		const char *tarfile,
+		const char *directory)
+{
+  struct guestfs_tar_in_args args;
+  struct tar_in_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_tar_in") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.directory = (char *) directory;
+  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);
+    return -1;
+  }
+
+  {
+    int r;
+
+    r = guestfs__send_file_sync (g, tarfile);
+    if (r == -1) {
+      guestfs_set_ready (g);
+      return -1;
+    }
+    if (r == -2) /* daemon cancelled */
+      goto read_reply;
+  }
+
+ read_reply:
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, tar_in_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_tar_in");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAR_IN, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct tar_out_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void tar_out_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct tar_out_ctx *ctx = (struct tar_out_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_tar_out");
+    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_tar_out");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_tar_out (guestfs_h *g,
+		const char *directory,
+		const char *tarfile)
+{
+  struct guestfs_tar_out_args args;
+  struct tar_out_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_tar_out") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.directory = (char *) directory;
+  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);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, tar_out_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_tar_out");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TAR_OUT, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (guestfs__receive_file_sync (g, tarfile) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct tgz_in_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void tgz_in_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct tgz_in_ctx *ctx = (struct tgz_in_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_tgz_in");
+    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_tgz_in");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_tgz_in (guestfs_h *g,
+		const char *tarball,
+		const char *directory)
+{
+  struct guestfs_tgz_in_args args;
+  struct tgz_in_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_tgz_in") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.directory = (char *) directory;
+  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);
+    return -1;
+  }
+
+  {
+    int r;
+
+    r = guestfs__send_file_sync (g, tarball);
+    if (r == -1) {
+      guestfs_set_ready (g);
+      return -1;
+    }
+    if (r == -2) /* daemon cancelled */
+      goto read_reply;
+  }
+
+ read_reply:
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, tgz_in_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_tgz_in");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TGZ_IN, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct tgz_out_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void tgz_out_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct tgz_out_ctx *ctx = (struct tgz_out_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_tgz_out");
+    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_tgz_out");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_tgz_out (guestfs_h *g,
+		const char *directory,
+		const char *tarball)
+{
+  struct guestfs_tgz_out_args args;
+  struct tgz_out_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_tgz_out") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.directory = (char *) directory;
+  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);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, tgz_out_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_tgz_out");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_TGZ_OUT, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (guestfs__receive_file_sync (g, tarball) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct mount_ro_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mount_ro_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mount_ro_ctx *ctx = (struct mount_ro_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mount_ro");
+    return;
+  }
+  if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+      error (g, "%s: failed to parse reply error", "guestfs_mount_ro");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_mount_ro (guestfs_h *g,
+		const char *device,
+		const char *mountpoint)
+{
+  struct guestfs_mount_ro_args args;
+  struct mount_ro_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mount_ro") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  args.mountpoint = (char *) mountpoint;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_RO,
+        (xdrproc_t) xdr_guestfs_mount_ro_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mount_ro_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mount_ro");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_RO, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct mount_options_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mount_options_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mount_options_ctx *ctx = (struct mount_options_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mount_options");
+    return;
+  }
+  if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+      error (g, "%s: failed to parse reply error", "guestfs_mount_options");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_mount_options (guestfs_h *g,
+		const char *options,
+		const char *device,
+		const char *mountpoint)
+{
+  struct guestfs_mount_options_args args;
+  struct mount_options_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mount_options") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.options = (char *) options;
+  args.device = (char *) device;
+  args.mountpoint = (char *) mountpoint;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_OPTIONS,
+        (xdrproc_t) xdr_guestfs_mount_options_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mount_options_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mount_options");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_OPTIONS, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct mount_vfs_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void mount_vfs_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct mount_vfs_ctx *ctx = (struct mount_vfs_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_mount_vfs");
+    return;
+  }
+  if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+      error (g, "%s: failed to parse reply error", "guestfs_mount_vfs");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_mount_vfs (guestfs_h *g,
+		const char *options,
+		const char *vfstype,
+		const char *device,
+		const char *mountpoint)
+{
+  struct guestfs_mount_vfs_args args;
+  struct mount_vfs_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_mount_vfs") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.options = (char *) options;
+  args.vfstype = (char *) vfstype;
+  args.device = (char *) device;
+  args.mountpoint = (char *) mountpoint;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_MOUNT_VFS,
+        (xdrproc_t) xdr_guestfs_mount_vfs_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, mount_vfs_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_mount_vfs");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_MOUNT_VFS, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct debug_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_debug_ret ret;
+};
+
+static void debug_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct debug_ctx *ctx = (struct debug_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_debug");
+    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_debug");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_debug_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_debug");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+char *guestfs_debug (guestfs_h *g,
+		const char *subcmd,
+		char * const* const extraargs)
+{
+  struct guestfs_debug_args args;
+  struct debug_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_debug") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.subcmd = (char *) subcmd;
+  args.extraargs.extraargs_val = (char **) extraargs;
+  for (args.extraargs.extraargs_len = 0; extraargs[args.extraargs.extraargs_len]; args.extraargs.extraargs_len++) ;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_DEBUG,
+        (xdrproc_t) xdr_guestfs_debug_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, debug_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_debug");
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_DEBUG, serial) == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs_set_ready (g);
+  return ctx.ret.result; /* caller will free */
+}
+
+struct lvremove_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void lvremove_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct lvremove_ctx *ctx = (struct lvremove_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_lvremove");
+    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_lvremove");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_lvremove (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_lvremove_args args;
+  struct lvremove_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_lvremove") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_LVREMOVE,
+        (xdrproc_t) xdr_guestfs_lvremove_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, lvremove_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_lvremove");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_LVREMOVE, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct vgremove_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void vgremove_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct vgremove_ctx *ctx = (struct vgremove_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_vgremove");
+    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_vgremove");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_vgremove (guestfs_h *g,
+		const char *vgname)
+{
+  struct guestfs_vgremove_args args;
+  struct vgremove_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_vgremove") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.vgname = (char *) vgname;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_VGREMOVE,
+        (xdrproc_t) xdr_guestfs_vgremove_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, vgremove_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_vgremove");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_VGREMOVE, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs_set_ready (g);
+  return 0;
+}
+
+struct pvremove_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = send called,
+   * 1001 = reply called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+};
+
+static void pvremove_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct pvremove_ctx *ctx = (struct pvremove_ctx *) data;
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_pvremove");
+    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_pvremove");
+      return;
+    }
+    goto done;
+  }
+ done:
+  ctx->cb_sequence = 1001;
+}
+
+int guestfs_pvremove (guestfs_h *g,
+		const char *device)
+{
+  struct guestfs_pvremove_args args;
+  struct pvremove_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_pvremove") == -1) return -1;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.device = (char *) device;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_PVREMOVE,
+        (xdrproc_t) xdr_guestfs_pvremove_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, pvremove_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1001) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_pvremove");
+    guestfs_set_ready (g);
+    return -1;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_PVREMOVE, serial) == -1) {
+    guestfs_set_ready (g);
+    return -1;
+  }
 
   if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
     error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
     return -1;
   }
 
+  guestfs_set_ready (g);
   return 0;
 }