Separate out the high-level API actions.

 - Split out the high-level API actions so that they are in a
   separate file, and use the defined guestfs C API, instead of
   fiddling around with internal structures.

23 files changed, 1948 insertions, 1734 deletions

diff --git a/daemon/proto.c b/daemon/proto.c
index 42bc6eaa..76dce987 100644
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -192,7 +192,7 @@ send_error (const char *msg)
     exit (1);
   }
 
-  err.error = (char *) msg;
+  err.error_message = (char *) msg;
 
   if (!xdr_guestfs_message_error (&xdr, &err)) {
     fprintf (stderr, "guestfsd: failed to encode error message body\n");
diff --git a/fish/cmds.c b/fish/cmds.c
index c197ecea..52709128 100644
--- a/fish/cmds.c
+++ b/fish/cmds.c
@@ -66,9 +66,14 @@ void list_commands (void)
   printf ("%-20s %s\n", "file", "determine file type");
   printf ("%-20s %s\n", "get-autosync", "get autosync mode");
   printf ("%-20s %s\n", "get-path", "get the search path");
+  printf ("%-20s %s\n", "get-state", "get the current state");
   printf ("%-20s %s\n", "get-verbose", "get verbose mode");
+  printf ("%-20s %s\n", "is-busy", "is busy processing a command");
+  printf ("%-20s %s\n", "is-config", "is in configuration state");
   printf ("%-20s %s\n", "is-dir", "test if file exists");
   printf ("%-20s %s\n", "is-file", "test if file exists");
+  printf ("%-20s %s\n", "is-launching", "is launching subprocess");
+  printf ("%-20s %s\n", "is-ready", "is ready to accept commands");
   printf ("%-20s %s\n", "kill-subprocess", "kill the qemu subprocess");
   printf ("%-20s %s\n", "launch", "launch the qemu subprocess");
   printf ("%-20s %s\n", "list-devices", "list the block devices");
@@ -145,6 +150,21 @@ void display_command (const char *cmd)
   if (strcasecmp (cmd, "get_verbose") == 0 || strcasecmp (cmd, "get-verbose") == 0)
     pod2text ("get-verbose - get verbose mode", " get-verbose\n\nThis returns the verbose messages flag.");
   else
+  if (strcasecmp (cmd, "is_ready") == 0 || strcasecmp (cmd, "is-ready") == 0)
+    pod2text ("is-ready - is ready to accept commands", " is-ready\n\nThis returns true iff this handle is ready to accept commands\n(in the C<READY> state).\n\nFor more information on states, see L<guestfs(3)>.");
+  else
+  if (strcasecmp (cmd, "is_config") == 0 || strcasecmp (cmd, "is-config") == 0)
+    pod2text ("is-config - is in configuration state", " is-config\n\nThis returns true iff this handle is being configured\n(in the C<CONFIG> state).\n\nFor more information on states, see L<guestfs(3)>.");
+  else
+  if (strcasecmp (cmd, "is_launching") == 0 || strcasecmp (cmd, "is-launching") == 0)
+    pod2text ("is-launching - is launching subprocess", " is-launching\n\nThis returns true iff this handle is launching the subprocess\n(in the C<LAUNCHING> state).\n\nFor more information on states, see L<guestfs(3)>.");
+  else
+  if (strcasecmp (cmd, "is_busy") == 0 || strcasecmp (cmd, "is-busy") == 0)
+    pod2text ("is-busy - is busy processing a command", " is-busy\n\nThis returns true iff this handle is busy processing a command\n(in the C<BUSY> state).\n\nFor more information on states, see L<guestfs(3)>.");
+  else
+  if (strcasecmp (cmd, "get_state") == 0 || strcasecmp (cmd, "get-state") == 0)
+    pod2text ("get-state - get the current state", " get-state\n\nThis returns the current state as an opaque integer.  This is\nonly useful for printing debug and internal error messages.\n\nFor more information on states, see L<guestfs(3)>.");
+  else
   if (strcasecmp (cmd, "mount") == 0)
     pod2text ("mount - mount a guest disk at a position in the filesystem", " mount <device> <mountpoint>\n\nMount a guest disk at a position in the filesystem.  Block devices\nare named C</dev/sda>, C</dev/sdb> and so on, as they were added to\nthe guest.  If those block devices contain partitions, they will have\nthe usual names (eg. C</dev/sda1>).  Also LVM C</dev/VG/LV>-style\nnames can be used.\n\nThe rules are the same as for L<mount(2)>:  A filesystem must\nfirst be mounted on C</> before others can be mounted.  Other\nfilesystems can only be mounted on directories which already\nexist.\n\nThe mounted filesystem is writable, if we have sufficient permissions\non the underlying device.\n\nThe filesystem options C<sync> and C<noatime> are set with this\ncall, in order to improve reliability.");
   else
@@ -629,6 +649,76 @@ static int run_get_verbose (const char *cmd, int argc, char *argv[])
   return 0;
 }
 
+static int run_is_ready (const char *cmd, int argc, char *argv[])
+{
+  int r;
+  if (argc != 0) {
+    fprintf (stderr, "%s should have 0 parameter(s)\n", cmd);
+    fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd);
+    return -1;
+  }
+  r = guestfs_is_ready (g);
+  if (r == -1) return -1;
+  if (r) printf ("true\n"); else printf ("false\n");
+  return 0;
+}
+
+static int run_is_config (const char *cmd, int argc, char *argv[])
+{
+  int r;
+  if (argc != 0) {
+    fprintf (stderr, "%s should have 0 parameter(s)\n", cmd);
+    fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd);
+    return -1;
+  }
+  r = guestfs_is_config (g);
+  if (r == -1) return -1;
+  if (r) printf ("true\n"); else printf ("false\n");
+  return 0;
+}
+
+static int run_is_launching (const char *cmd, int argc, char *argv[])
+{
+  int r;
+  if (argc != 0) {
+    fprintf (stderr, "%s should have 0 parameter(s)\n", cmd);
+    fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd);
+    return -1;
+  }
+  r = guestfs_is_launching (g);
+  if (r == -1) return -1;
+  if (r) printf ("true\n"); else printf ("false\n");
+  return 0;
+}
+
+static int run_is_busy (const char *cmd, int argc, char *argv[])
+{
+  int r;
+  if (argc != 0) {
+    fprintf (stderr, "%s should have 0 parameter(s)\n", cmd);
+    fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd);
+    return -1;
+  }
+  r = guestfs_is_busy (g);
+  if (r == -1) return -1;
+  if (r) printf ("true\n"); else printf ("false\n");
+  return 0;
+}
+
+static int run_get_state (const char *cmd, int argc, char *argv[])
+{
+  int r;
+  if (argc != 0) {
+    fprintf (stderr, "%s should have 0 parameter(s)\n", cmd);
+    fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd);
+    return -1;
+  }
+  r = guestfs_get_state (g);
+  if (r == -1) return -1;
+  printf ("%d\n", r);
+  return 0;
+}
+
 static int run_mount (const char *cmd, int argc, char *argv[])
 {
   int r;
@@ -1683,6 +1773,21 @@ int run_action (const char *cmd, int argc, char *argv[])
   if (strcasecmp (cmd, "get_verbose") == 0 || strcasecmp (cmd, "get-verbose") == 0)
     return run_get_verbose (cmd, argc, argv);
   else
+  if (strcasecmp (cmd, "is_ready") == 0 || strcasecmp (cmd, "is-ready") == 0)
+    return run_is_ready (cmd, argc, argv);
+  else
+  if (strcasecmp (cmd, "is_config") == 0 || strcasecmp (cmd, "is-config") == 0)
+    return run_is_config (cmd, argc, argv);
+  else
+  if (strcasecmp (cmd, "is_launching") == 0 || strcasecmp (cmd, "is-launching") == 0)
+    return run_is_launching (cmd, argc, argv);
+  else
+  if (strcasecmp (cmd, "is_busy") == 0 || strcasecmp (cmd, "is-busy") == 0)
+    return run_is_busy (cmd, argc, argv);
+  else
+  if (strcasecmp (cmd, "get_state") == 0 || strcasecmp (cmd, "get-state") == 0)
+    return run_get_state (cmd, argc, argv);
+  else
   if (strcasecmp (cmd, "mount") == 0)
     return run_mount (cmd, argc, argv);
   else
diff --git a/fish/completion.c b/fish/completion.c
index f7ba61fb..a346ccbb 100644
--- a/fish/completion.c
+++ b/fish/completion.c
@@ -72,9 +72,14 @@ static const char *commands[] = {
   "file",
   "get-autosync",
   "get-path",
+  "get-state",
   "get-verbose",
+  "is-busy",
+  "is-config",
   "is-dir",
   "is-file",
+  "is-launching",
+  "is-ready",
   "kill-subprocess",
   "launch",
   "list-devices",
diff --git a/guestfish-actions.pod b/guestfish-actions.pod
index 116878de..6fa86492 100644
--- a/guestfish-actions.pod
+++ b/guestfish-actions.pod
@@ -394,12 +394,39 @@ Return the current search path.
 This is always non-NULL.  If it wasn't set already, then this will
 return the default path.
 
+=head2 get-state
+
+ get-state
+
+This returns the current state as an opaque integer.  This is
+only useful for printing debug and internal error messages.
+
+For more information on states, see L<guestfs(3)>.
+
 =head2 get-verbose
 
  get-verbose
 
 This returns the verbose messages flag.
 
+=head2 is-busy
+
+ is-busy
+
+This returns true iff this handle is busy processing a command
+(in the C<BUSY> state).
+
+For more information on states, see L<guestfs(3)>.
+
+=head2 is-config
+
+ is-config
+
+This returns true iff this handle is being configured
+(in the C<CONFIG> state).
+
+For more information on states, see L<guestfs(3)>.
+
 =head2 is-dir
 
  is-dir path
@@ -420,6 +447,24 @@ other objects like directories.
 
 See also C<stat>.
 
+=head2 is-launching
+
+ is-launching
+
+This returns true iff this handle is launching the subprocess
+(in the C<LAUNCHING> state).
+
+For more information on states, see L<guestfs(3)>.
+
+=head2 is-ready
+
+ is-ready
+
+This returns true iff this handle is ready to accept commands
+(in the C<READY> state).
+
+For more information on states, see L<guestfs(3)>.
+
 =head2 kill-subprocess
 
  kill-subprocess
diff --git a/guestfs-actions.pod b/guestfs-actions.pod
index 520425cc..8667340a 100644
--- a/guestfs-actions.pod
+++ b/guestfs-actions.pod
@@ -520,6 +520,17 @@ return the default path.
 This function returns a string, or NULL on error.
 The string is owned by the guest handle and must I<not> be freed.
 
+=head2 guestfs_get_state
+
+ int guestfs_get_state (guestfs_h *handle);
+
+This returns the current state as an opaque integer.  This is
+only useful for printing debug and internal error messages.
+
+For more information on states, see L<guestfs(3)>.
+
+On error this function returns -1.
+
 =head2 guestfs_get_verbose
 
  int guestfs_get_verbose (guestfs_h *handle);
@@ -528,6 +539,28 @@ This returns the verbose messages flag.
 
 This function returns a C truth value on success or -1 on error.
 
+=head2 guestfs_is_busy
+
+ int guestfs_is_busy (guestfs_h *handle);
+
+This returns true iff this handle is busy processing a command
+(in the C<BUSY> state).
+
+For more information on states, see L<guestfs(3)>.
+
+This function returns a C truth value on success or -1 on error.
+
+=head2 guestfs_is_config
+
+ int guestfs_is_config (guestfs_h *handle);
+
+This returns true iff this handle is being configured
+(in the C<CONFIG> state).
+
+For more information on states, see L<guestfs(3)>.
+
+This function returns a C truth value on success or -1 on error.
+
 =head2 guestfs_is_dir
 
  int guestfs_is_dir (guestfs_h *handle,
@@ -554,6 +587,28 @@ See also C<guestfs_stat>.
 
 This function returns a C truth value on success or -1 on error.
 
+=head2 guestfs_is_launching
+
+ int guestfs_is_launching (guestfs_h *handle);
+
+This returns true iff this handle is launching the subprocess
+(in the C<LAUNCHING> state).
+
+For more information on states, see L<guestfs(3)>.
+
+This function returns a C truth value on success or -1 on error.
+
+=head2 guestfs_is_ready
+
+ int guestfs_is_ready (guestfs_h *handle);
+
+This returns true iff this handle is ready to accept commands
+(in the C<READY> state).
+
+For more information on states, see L<guestfs(3)>.
+
+This function returns a C truth value on success or -1 on error.
+
 =head2 guestfs_kill_subprocess
 
  int guestfs_kill_subprocess (guestfs_h *handle);
diff --git a/ocaml/guestfs.ml b/ocaml/guestfs.ml
index 6477e95b..0ea77c70 100644
--- a/ocaml/guestfs.ml
+++ b/ocaml/guestfs.ml
@@ -127,6 +127,11 @@ external set_autosync : t -> bool -> unit = "ocaml_guestfs_set_autosync"
 external get_autosync : t -> bool = "ocaml_guestfs_get_autosync"
 external set_verbose : t -> bool -> unit = "ocaml_guestfs_set_verbose"
 external get_verbose : t -> bool = "ocaml_guestfs_get_verbose"
+external is_ready : t -> bool = "ocaml_guestfs_is_ready"
+external is_config : t -> bool = "ocaml_guestfs_is_config"
+external is_launching : t -> bool = "ocaml_guestfs_is_launching"
+external is_busy : t -> bool = "ocaml_guestfs_is_busy"
+external get_state : t -> int = "ocaml_guestfs_get_state"
 external mount : t -> string -> string -> unit = "ocaml_guestfs_mount"
 external sync : t -> unit = "ocaml_guestfs_sync"
 external touch : t -> string -> unit = "ocaml_guestfs_touch"
diff --git a/ocaml/guestfs.mli b/ocaml/guestfs.mli
index b9b9f522..6c763631 100644
--- a/ocaml/guestfs.mli
+++ b/ocaml/guestfs.mli
@@ -160,6 +160,21 @@ val set_verbose : t -> bool -> unit
 val get_verbose : t -> bool
 (** get verbose mode *)
 
+val is_ready : t -> bool
+(** is ready to accept commands *)
+
+val is_config : t -> bool
+(** is in configuration state *)
+
+val is_launching : t -> bool
+(** is launching subprocess *)
+
+val is_busy : t -> bool
+(** is busy processing a command *)
+
+val get_state : t -> int
+(** get the current state *)
+
 val mount : t -> string -> string -> unit
 (** mount a guest disk at a position in the filesystem *)
 
diff --git a/ocaml/guestfs_c_actions.c b/ocaml/guestfs_c_actions.c
index c0618b29..dd2f6f47 100644
--- a/ocaml/guestfs_c_actions.c
+++ b/ocaml/guestfs_c_actions.c
@@ -601,6 +601,116 @@ ocaml_guestfs_get_verbose (value gv)
 }
 
 CAMLprim value
+ocaml_guestfs_is_ready (value gv)
+{
+  CAMLparam1 (gv);
+  CAMLlocal1 (rv);
+
+  guestfs_h *g = Guestfs_val (gv);
+  if (g == NULL)
+    caml_failwith ("is_ready: used handle after closing it");
+
+  int r;
+
+  caml_enter_blocking_section ();
+  r = guestfs_is_ready (g);
+  caml_leave_blocking_section ();
+  if (r == -1)
+    ocaml_guestfs_raise_error (g, "is_ready");
+
+  rv = Val_bool (r);
+  CAMLreturn (rv);
+}
+
+CAMLprim value
+ocaml_guestfs_is_config (value gv)
+{
+  CAMLparam1 (gv);
+  CAMLlocal1 (rv);
+
+  guestfs_h *g = Guestfs_val (gv);
+  if (g == NULL)
+    caml_failwith ("is_config: used handle after closing it");
+
+  int r;
+
+  caml_enter_blocking_section ();
+  r = guestfs_is_config (g);
+  caml_leave_blocking_section ();
+  if (r == -1)
+    ocaml_guestfs_raise_error (g, "is_config");
+
+  rv = Val_bool (r);
+  CAMLreturn (rv);
+}
+
+CAMLprim value
+ocaml_guestfs_is_launching (value gv)
+{
+  CAMLparam1 (gv);
+  CAMLlocal1 (rv);
+
+  guestfs_h *g = Guestfs_val (gv);
+  if (g == NULL)
+    caml_failwith ("is_launching: used handle after closing it");
+
+  int r;
+
+  caml_enter_blocking_section ();
+  r = guestfs_is_launching (g);
+  caml_leave_blocking_section ();
+  if (r == -1)
+    ocaml_guestfs_raise_error (g, "is_launching");
+
+  rv = Val_bool (r);
+  CAMLreturn (rv);
+}
+
+CAMLprim value
+ocaml_guestfs_is_busy (value gv)
+{
+  CAMLparam1 (gv);
+  CAMLlocal1 (rv);
+
+  guestfs_h *g = Guestfs_val (gv);
+  if (g == NULL)
+    caml_failwith ("is_busy: used handle after closing it");
+
+  int r;
+
+  caml_enter_blocking_section ();
+  r = guestfs_is_busy (g);
+  caml_leave_blocking_section ();
+  if (r == -1)
+    ocaml_guestfs_raise_error (g, "is_busy");
+
+  rv = Val_bool (r);
+  CAMLreturn (rv);
+}
+
+CAMLprim value
+ocaml_guestfs_get_state (value gv)
+{
+  CAMLparam1 (gv);
+  CAMLlocal1 (rv);
+
+  guestfs_h *g = Guestfs_val (gv);
+  if (g == NULL)
+    caml_failwith ("get_state: used handle after closing it");
+
+  int r;
+
+  caml_enter_blocking_section ();
+  r = guestfs_get_state (g);
+  caml_leave_blocking_section ();
+  if (r == -1)
+    ocaml_guestfs_raise_error (g, "get_state");
+
+  rv = Val_int (r);
+  CAMLreturn (rv);
+}
+
+CAMLprim value
 ocaml_guestfs_mount (value gv, value devicev, value mountpointv)
 {
   CAMLparam3 (gv, devicev, mountpointv);
diff --git a/perl/Guestfs.xs b/perl/Guestfs.xs
index beb1c997..e4a1b502 100644
--- a/perl/Guestfs.xs
+++ b/perl/Guestfs.xs
@@ -239,6 +239,71 @@ PREINIT:
  OUTPUT:
       RETVAL
 
+SV *
+is_ready (g)
+      guestfs_h *g;
+PREINIT:
+      int ready;
+   CODE:
+      ready = guestfs_is_ready (g);
+      if (ready == -1)
+        croak ("is_ready: %s", guestfs_last_error (g));
+      RETVAL = newSViv (ready);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_config (g)
+      guestfs_h *g;
+PREINIT:
+      int config;
+   CODE:
+      config = guestfs_is_config (g);
+      if (config == -1)
+        croak ("is_config: %s", guestfs_last_error (g));
+      RETVAL = newSViv (config);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_launching (g)
+      guestfs_h *g;
+PREINIT:
+      int launching;
+   CODE:
+      launching = guestfs_is_launching (g);
+      if (launching == -1)
+        croak ("is_launching: %s", guestfs_last_error (g));
+      RETVAL = newSViv (launching);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_busy (g)
+      guestfs_h *g;
+PREINIT:
+      int busy;
+   CODE:
+      busy = guestfs_is_busy (g);
+      if (busy == -1)
+        croak ("is_busy: %s", guestfs_last_error (g));
+      RETVAL = newSViv (busy);
+ OUTPUT:
+      RETVAL
+
+SV *
+get_state (g)
+      guestfs_h *g;
+PREINIT:
+      int state;
+   CODE:
+      state = guestfs_get_state (g);
+      if (state == -1)
+        croak ("get_state: %s", guestfs_last_error (g));
+      RETVAL = newSViv (state);
+ OUTPUT:
+      RETVAL
+
 void
 mount (g, device, mountpoint)
       guestfs_h *g;
diff --git a/perl/lib/Sys/Guestfs.pm b/perl/lib/Sys/Guestfs.pm
index 28d2b0fa..71223145 100644
--- a/perl/lib/Sys/Guestfs.pm
+++ b/perl/lib/Sys/Guestfs.pm
@@ -417,10 +417,31 @@ Return the current search path.
 This is always non-NULL.  If it wasn't set already, then this will
 return the default path.
 
+=item $state = $h->get_state ();
+
+This returns the current state as an opaque integer.  This is
+only useful for printing debug and internal error messages.
+
+For more information on states, see L<guestfs(3)>.
+
 =item $verbose = $h->get_verbose ();
 
 This returns the verbose messages flag.
 
+=item $busy = $h->is_busy ();
+
+This returns true iff this handle is busy processing a command
+(in the C<BUSY> state).
+
+For more information on states, see L<guestfs(3)>.
+
+=item $config = $h->is_config ();
+
+This returns true iff this handle is being configured
+(in the C<CONFIG> state).
+
+For more information on states, see L<guestfs(3)>.
+
 =item $dirflag = $h->is_dir ($path);
 
 This returns C<true> if and only if there is a directory
@@ -437,6 +458,20 @@ other objects like directories.
 
 See also C<$h-E<gt>stat>.
 
+=item $launching = $h->is_launching ();
+
+This returns true iff this handle is launching the subprocess
+(in the C<LAUNCHING> state).
+
+For more information on states, see L<guestfs(3)>.
+
+=item $ready = $h->is_ready ();
+
+This returns true iff this handle is ready to accept commands
+(in the C<READY> state).
+
+For more information on states, see L<guestfs(3)>.
+
 =item $h->kill_subprocess ();
 
 This kills the qemu subprocess.  You should never need to call this.
diff --git a/python/guestfs-py.c b/python/guestfs-py.c
index 09d42707..d1f0a9e7 100644
--- a/python/guestfs-py.c
+++ b/python/guestfs-py.c
@@ -681,6 +681,121 @@ py_guestfs_get_verbose (PyObject *self, PyObject *args)
 }
 
 static PyObject *
+py_guestfs_is_ready (PyObject *self, PyObject *args)
+{
+  PyObject *py_g;
+  guestfs_h *g;
+  PyObject *py_r;
+  int r;
+
+  if (!PyArg_ParseTuple (args, (char *) "O:guestfs_is_ready",
+                         &py_g))
+    return NULL;
+  g = get_handle (py_g);
+
+  r = guestfs_is_ready (g);
+  if (r == -1) {
+    PyErr_SetString (PyExc_RuntimeError, guestfs_last_error (g));
+    return NULL;
+  }
+
+  py_r = PyInt_FromLong ((long) r);
+  return py_r;
+}
+
+static PyObject *
+py_guestfs_is_config (PyObject *self, PyObject *args)
+{
+  PyObject *py_g;
+  guestfs_h *g;
+  PyObject *py_r;
+  int r;
+
+  if (!PyArg_ParseTuple (args, (char *) "O:guestfs_is_config",
+                         &py_g))
+    return NULL;
+  g = get_handle (py_g);
+
+  r = guestfs_is_config (g);
+  if (r == -1) {
+    PyErr_SetString (PyExc_RuntimeError, guestfs_last_error (g));
+    return NULL;
+  }
+
+  py_r = PyInt_FromLong ((long) r);
+  return py_r;
+}
+
+static PyObject *
+py_guestfs_is_launching (PyObject *self, PyObject *args)
+{
+  PyObject *py_g;
+  guestfs_h *g;
+  PyObject *py_r;
+  int r;
+
+  if (!PyArg_ParseTuple (args, (char *) "O:guestfs_is_launching",
+                         &py_g))
+    return NULL;
+  g = get_handle (py_g);
+
+  r = guestfs_is_launching (g);
+  if (r == -1) {
+    PyErr_SetString (PyExc_RuntimeError, guestfs_last_error (g));
+    return NULL;
+  }
+
+  py_r = PyInt_FromLong ((long) r);
+  return py_r;
+}
+
+static PyObject *
+py_guestfs_is_busy (PyObject *self, PyObject *args)
+{
+  PyObject *py_g;
+  guestfs_h *g;
+  PyObject *py_r;
+  int r;
+
+  if (!PyArg_ParseTuple (args, (char *) "O:guestfs_is_busy",
+                         &py_g))
+    return NULL;
+  g = get_handle (py_g);
+
+  r = guestfs_is_busy (g);
+  if (r == -1) {
+    PyErr_SetString (PyExc_RuntimeError, guestfs_last_error (g));
+    return NULL;
+  }
+
+  py_r = PyInt_FromLong ((long) r);
+  return py_r;
+}
+
+static PyObject *
+py_guestfs_get_state (PyObject *self, PyObject *args)
+{
+  PyObject *py_g;
+  guestfs_h *g;
+  PyObject *py_r;
+  int r;
+
+  if (!PyArg_ParseTuple (args, (char *) "O:guestfs_get_state",
+                         &py_g))
+    return NULL;
+  g = get_handle (py_g);
+
+  r = guestfs_get_state (g);
+  if (r == -1) {
+    PyErr_SetString (PyExc_RuntimeError, guestfs_last_error (g));
+    return NULL;
+  }
+
+  py_r = PyInt_FromLong ((long) r);
+  return py_r;
+}
+
+static PyObject *
 py_guestfs_mount (PyObject *self, PyObject *args)
 {
   PyObject *py_g;
@@ -2336,6 +2451,11 @@ static PyMethodDef methods[] = {
   { (char *) "get_autosync", py_guestfs_get_autosync, METH_VARARGS, NULL },
   { (char *) "set_verbose", py_guestfs_set_verbose, METH_VARARGS, NULL },
   { (char *) "get_verbose", py_guestfs_get_verbose, METH_VARARGS, NULL },
+  { (char *) "is_ready", py_guestfs_is_ready, METH_VARARGS, NULL },
+  { (char *) "is_config", py_guestfs_is_config, METH_VARARGS, NULL },
+  { (char *) "is_launching", py_guestfs_is_launching, METH_VARARGS, NULL },
+  { (char *) "is_busy", py_guestfs_is_busy, METH_VARARGS, NULL },
+  { (char *) "get_state", py_guestfs_get_state, METH_VARARGS, NULL },
   { (char *) "mount", py_guestfs_mount, METH_VARARGS, NULL },
   { (char *) "sync", py_guestfs_sync, METH_VARARGS, NULL },
   { (char *) "touch", py_guestfs_touch, METH_VARARGS, NULL },
diff --git a/python/guestfs.py b/python/guestfs.py
index 0a4c3960..943f80a7 100644
--- a/python/guestfs.py
+++ b/python/guestfs.py
@@ -193,6 +193,47 @@ class GuestFS:
         """
         return libguestfsmod.get_verbose (self._o)
 
+    def is_ready (self):
+        u"""This returns true iff this handle is ready to accept
+        commands (in the "READY" state).
+        
+        For more information on states, see guestfs(3).
+        """
+        return libguestfsmod.is_ready (self._o)
+
+    def is_config (self):
+        u"""This returns true iff this handle is being configured
+        (in the "CONFIG" state).
+        
+        For more information on states, see guestfs(3).
+        """
+        return libguestfsmod.is_config (self._o)
+
+    def is_launching (self):
+        u"""This returns true iff this handle is launching the
+        subprocess (in the "LAUNCHING" state).
+        
+        For more information on states, see guestfs(3).
+        """
+        return libguestfsmod.is_launching (self._o)
+
+    def is_busy (self):
+        u"""This returns true iff this handle is busy processing a
+        command (in the "BUSY" state).
+        
+        For more information on states, see guestfs(3).
+        """
+        return libguestfsmod.is_busy (self._o)
+
+    def get_state (self):
+        u"""This returns the current state as an opaque integer.
+        This is only useful for printing debug and internal
+        error messages.
+        
+        For more information on states, see guestfs(3).
+        """
+        return libguestfsmod.get_state (self._o)
+
     def mount (self, device, mountpoint):
         u"""Mount a guest disk at a position in the filesystem.
         Block devices are named "/dev/sda", "/dev/sdb" and so
diff --git a/ruby/ext/guestfs/_guestfs.c b/ruby/ext/guestfs/_guestfs.c
index d6850465..cd4c2718 100644
--- a/ruby/ext/guestfs/_guestfs.c
+++ b/ruby/ext/guestfs/_guestfs.c
@@ -289,6 +289,91 @@ static VALUE ruby_guestfs_get_verbose (VALUE gv)
   return INT2NUM (r);
 }
 
+static VALUE ruby_guestfs_is_ready (VALUE gv)
+{
+  guestfs_h *g;
+  Data_Get_Struct (gv, guestfs_h, g);
+  if (!g)
+    rb_raise (rb_eArgError, "%s: used handle after closing it", "is_ready");
+
+
+  int r;
+
+  r = guestfs_is_ready (g);
+  if (r == -1)
+    rb_raise (e_Error, "%s", guestfs_last_error (g));
+
+  return INT2NUM (r);
+}
+
+static VALUE ruby_guestfs_is_config (VALUE gv)
+{
+  guestfs_h *g;
+  Data_Get_Struct (gv, guestfs_h, g);
+  if (!g)
+    rb_raise (rb_eArgError, "%s: used handle after closing it", "is_config");
+
+
+  int r;
+
+  r = guestfs_is_config (g);
+  if (r == -1)
+    rb_raise (e_Error, "%s", guestfs_last_error (g));
+
+  return INT2NUM (r);
+}
+
+static VALUE ruby_guestfs_is_launching (VALUE gv)
+{
+  guestfs_h *g;
+  Data_Get_Struct (gv, guestfs_h, g);
+  if (!g)
+    rb_raise (rb_eArgError, "%s: used handle after closing it", "is_launching");
+
+
+  int r;
+
+  r = guestfs_is_launching (g);
+  if (r == -1)
+    rb_raise (e_Error, "%s", guestfs_last_error (g));
+
+  return INT2NUM (r);
+}
+
+static VALUE ruby_guestfs_is_busy (VALUE gv)
+{
+  guestfs_h *g;
+  Data_Get_Struct (gv, guestfs_h, g);
+  if (!g)
+    rb_raise (rb_eArgError, "%s: used handle after closing it", "is_busy");
+
+
+  int r;
+
+  r = guestfs_is_busy (g);
+  if (r == -1)
+    rb_raise (e_Error, "%s", guestfs_last_error (g));
+
+  return INT2NUM (r);
+}
+
+static VALUE ruby_guestfs_get_state (VALUE gv)
+{
+  guestfs_h *g;
+  Data_Get_Struct (gv, guestfs_h, g);
+  if (!g)
+    rb_raise (rb_eArgError, "%s: used handle after closing it", "get_state");
+
+
+  int r;
+
+  r = guestfs_get_state (g);
+  if (r == -1)
+    rb_raise (e_Error, "%s", guestfs_last_error (g));
+
+  return INT2NUM (r);
+}
+
 static VALUE ruby_guestfs_mount (VALUE gv, VALUE devicev, VALUE mountpointv)
 {
   guestfs_h *g;
@@ -1931,6 +2016,16 @@ void Init__guestfs ()
         ruby_guestfs_set_verbose, 1);
   rb_define_method (c_guestfs, "get_verbose",
         ruby_guestfs_get_verbose, 0);
+  rb_define_method (c_guestfs, "is_ready",
+        ruby_guestfs_is_ready, 0);
+  rb_define_method (c_guestfs, "is_config",
+        ruby_guestfs_is_config, 0);
+  rb_define_method (c_guestfs, "is_launching",
+        ruby_guestfs_is_launching, 0);
+  rb_define_method (c_guestfs, "is_busy",
+        ruby_guestfs_is_busy, 0);
+  rb_define_method (c_guestfs, "get_state",
+        ruby_guestfs_get_state, 0);
   rb_define_method (c_guestfs, "mount",
         ruby_guestfs_mount, 2);
   rb_define_method (c_guestfs, "sync",
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e3fdf8c..9868b422 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,11 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# NB. guestfs-actions.c is #include'd into guestfs.c, so it should not
-# be listed as a source file.
-EXTRA_DIST = guestfs-actions.c
-
-EXTRA_DIST += guestfs_protocol.x \
+EXTRA_DIST = guestfs_protocol.x \
 	guestfs_protocol.c \
 	guestfs_protocol.h
 
@@ -35,7 +31,8 @@ libguestfs_la_SOURCES = \
 	guestfs.h \
 	guestfs_protocol.c \
 	guestfs_protocol.h \
-	guestfs-actions.h
+	guestfs-actions.h \
+	guestfs-actions.c
 
 libguestfs_la_CFLAGS = -Wall -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
 
diff --git a/src/generator.ml b/src/generator.ml
index 77bcc47e..25351202 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -334,7 +334,52 @@ C<LIBGUESTFS_DEBUG> is defined and set to C<1>.");
    [],
    "get verbose mode",
    "\
-This returns the verbose messages flag.")
+This returns the verbose messages flag.");
+
+  ("is_ready", (RBool "ready", []), -1, [],
+   [],
+   "is ready to accept commands",
+   "\
+This returns true iff this handle is ready to accept commands
+(in the C<READY> state).
+
+For more information on states, see L<guestfs(3)>.");
+
+  ("is_config", (RBool "config", []), -1, [],
+   [],
+   "is in configuration state",
+   "\
+This returns true iff this handle is being configured
+(in the C<CONFIG> state).
+
+For more information on states, see L<guestfs(3)>.");
+
+  ("is_launching", (RBool "launching", []), -1, [],
+   [],
+   "is launching subprocess",
+   "\
+This returns true iff this handle is launching the subprocess
+(in the C<LAUNCHING> state).
+
+For more information on states, see L<guestfs(3)>.");
+
+  ("is_busy", (RBool "busy", []), -1, [],
+   [],
+   "is busy processing a command",
+   "\
+This returns true iff this handle is busy processing a command
+(in the C<BUSY> state).
+
+For more information on states, see L<guestfs(3)>.");
+
+  ("get_state", (RInt "state", []), -1, [],
+   [],
+   "get the current state",
+   "\
+This returns the current state as an opaque integer.  This is
+only useful for printing debug and internal error messages.
+
+For more information on states, see L<guestfs(3)>.");
 ]
 
 let daemon_functions = [
@@ -1218,7 +1263,7 @@ filesystem.
 
 C<filename> can also be a named pipe.
 
-See also C<guestfs_upload>.");
+See also C<guestfs_download>.");
 
   ("download", (RErr, [String "remotefilename"; FileOut "filename"]), 67, [],
    [],
@@ -1229,7 +1274,7 @@ on the local machine.
 
 C<filename> can also be a named pipe.
 
-See also C<guestfs_download>, C<guestfs_cat>.");
+See also C<guestfs_upload>, C<guestfs_cat>.");
 *)
 
 ]
@@ -1897,7 +1942,7 @@ enum guestfs_message_status {
 const GUESTFS_ERROR_LEN = 256;
 
 struct guestfs_message_error {
-  string error<GUESTFS_ERROR_LEN>;   /* error message */
+  string error_message<GUESTFS_ERROR_LEN>;
 };
 
 /* For normal requests and replies (not involving any FileIn or
@@ -2022,19 +2067,83 @@ and generate_actions_h () =
 and generate_client_actions () =
   generate_header CStyle LGPLv2;
 
+  pr "\
+#include <stdio.h>
+#include <stdlib.h>
+
+#include \"guestfs.h\"
+#include \"guestfs_protocol.h\"
+
+#define error guestfs_error
+#define perrorf guestfs_perrorf
+#define safe_malloc guestfs_safe_malloc
+#define safe_realloc guestfs_safe_realloc
+#define safe_strdup guestfs_safe_strdup
+#define safe_memdup guestfs_safe_memdup
+
+/* Check the return message from a call for validity. */
+static int
+check_reply_header (guestfs_h *g,
+                    const struct guestfs_message_header *hdr,
+                    int proc_nr, int serial)
+{
+  if (hdr->prog != GUESTFS_PROGRAM) {
+    error (g, \"wrong program (%%d/%%d)\", hdr->prog, GUESTFS_PROGRAM);
+    return -1;
+  }
+  if (hdr->vers != GUESTFS_PROTOCOL_VERSION) {
+    error (g, \"wrong protocol version (%%d/%%d)\",
+	   hdr->vers, GUESTFS_PROTOCOL_VERSION);
+    return -1;
+  }
+  if (hdr->direction != GUESTFS_DIRECTION_REPLY) {
+    error (g, \"unexpected message direction (%%d/%%d)\",
+	   hdr->direction, GUESTFS_DIRECTION_REPLY);
+    return -1;
+  }
+  if (hdr->proc != proc_nr) {
+    error (g, \"unexpected procedure number (%%d/%%d)\", hdr->proc, proc_nr);
+    return -1;
+  }
+  if (hdr->serial != serial) {
+    error (g, \"unexpected serial (%%d/%%d)\", hdr->serial, serial);
+    return -1;
+  }
+
+  return 0;
+}
+
+/* Check we are in the right state to run a high-level action. */
+static int
+check_state (guestfs_h *g, const char *caller)
+{
+  if (!guestfs_is_ready (g)) {
+    if (guestfs_is_config (g))
+      error (g, \"%%s: call launch() before using this function\",
+        caller);
+    else if (guestfs_is_launching (g))
+      error (g, \"%%s: call wait_ready() before using this function\",
+        caller);
+    else
+      error (g, \"%%s called from the wrong state, %%d != READY\",
+        caller, guestfs_get_state (g));
+    return -1;
+  }
+  return 0;
+}
+
+";
+
   (* Client-side stubs for each function. *)
   List.iter (
     fun (shortname, style, _, _, _, _, _) ->
       let name = "guestfs_" ^ shortname in
 
       (* Generate the state struct which stores the high-level
-       * state between callback functions.  The callback(s) are:
-       *   <name>_cb_header_sent      header was sent
-       *   <name>_cb_file_sent        FileIn file was sent
-       *   <name>_cb_reply_received   reply received
+       * state between callback functions.
        *)
       pr "struct %s_state {\n" shortname;
-      pr "  int cb_done;\n";
+      pr "  int cb_state;\n";
       pr "  struct guestfs_message_header hdr;\n";
       pr "  struct guestfs_message_error err;\n";
       (match fst style with
@@ -2055,6 +2164,7 @@ and generate_client_actions () =
       (* Generate the callback function. *)
       pr "static void %s_cb (guestfs_h *g, void *data, XDR *xdr)\n" shortname;
       pr "{\n";
+      pr "  guestfs_main_loop *ml = guestfs_get_main_loop (g);\n";
       pr "  struct %s_state *state = (struct %s_state *) data;\n" shortname shortname;
       pr "\n";
       pr "  if (!xdr_guestfs_message_header (xdr, &state->hdr)) {\n";
@@ -2086,8 +2196,8 @@ and generate_client_actions () =
       );
 
       pr " done:\n";
-      pr "  state->cb_done = 1;\n";
-      pr "  g->main_loop->main_loop_quit (g->main_loop, g);\n";
+      pr "  state->cb_state = 1;\n";
+      pr "  ml->main_loop_quit (ml, g);\n";
       pr "}\n\n";
 
       (* Generate the action stub. *)
@@ -2113,20 +2223,10 @@ and generate_client_actions () =
       );
 
       pr "  struct %s_state state;\n" shortname;
+      pr "  guestfs_main_loop *ml = guestfs_get_main_loop (g);\n";
       pr "  int serial;\n";
       pr "\n";
-      pr "  if (g->state != READY) {\n";
-      pr "    if (g->state == CONFIG)\n";
-      pr "      error (g, \"%%s: call launch() before using this function\",\n";
-      pr "        \"%s\");\n" name;
-      pr "    else if (g->state == LAUNCHING)\n";
-      pr "      error (g, \"%%s: call wait_ready() before using this function\",\n";
-      pr "        \"%s\");\n" name;
-      pr "    else\n";
-      pr "      error (g, \"%%s called from the wrong state, %%d != READY\",\n";
-      pr "        \"%s\", g->state);\n" name;
-      pr "    return %s;\n" error_code;
-      pr "  }\n";
+      pr "  if (check_state (g, \"%s\") == -1) return %s;\n" name error_code;
       pr "\n";
       pr "  memset (&state, 0, sizeof state);\n";
       pr "\n";
@@ -2134,7 +2234,7 @@ and generate_client_actions () =
       (* Dispatch the main header and arguments. *)
       (match snd style with
        | [] ->
-	   pr "  serial = dispatch (g, GUESTFS_PROC_%s, NULL, NULL);\n"
+	   pr "  serial = guestfs_send (g, GUESTFS_PROC_%s, NULL, NULL);\n"
 	     (String.uppercase shortname)
        | args ->
 	   List.iter (
@@ -2152,7 +2252,7 @@ and generate_client_actions () =
 		 pr "  args.%s = %s;\n" n n
 	     | FileIn _ | FileOut _ -> ()
 	   ) args;
-	   pr "  serial = dispatch (g, GUESTFS_PROC_%s,\n"
+	   pr "  serial = guestfs_send (g, GUESTFS_PROC_%s,\n"
 	     (String.uppercase shortname);
 	   pr "                     (xdrproc_t) xdr_%s_args, (char *) &args);\n"
 	     name;
@@ -2172,13 +2272,11 @@ and generate_client_actions () =
       ) (snd style);
 
       (* Wait for the reply from the remote end. *)
-      pr "  state.cb_done = 0;\n";
-      pr "  g->reply_cb_internal = %s_cb;\n" shortname;
-      pr "  g->reply_cb_internal_data = &state;\n";
-      pr "  (void) g->main_loop->main_loop_run (g->main_loop, g);\n";
-      pr "  g->reply_cb_internal = NULL;\n";
-      pr "  g->reply_cb_internal_data = NULL;\n";
-      pr "  if (!state.cb_done) {\n";
+      pr "  state.cb_state = 0;\n";
+      pr "  guestfs_set_reply_callback (g, %s_cb, &state);\n" shortname;
+      pr "  (void) ml->main_loop_run (ml, g);\n";
+      pr "  guestfs_set_reply_callback (g, NULL, NULL);\n";
+      pr "  if (!state.cb_state) {\n";
       pr "    error (g, \"%s failed, see earlier error messages\");\n" name;
       pr "    return %s;\n" error_code;
       pr "  }\n";
@@ -2190,7 +2288,7 @@ and generate_client_actions () =
       pr "\n";
 
       pr "  if (state.hdr.status == GUESTFS_STATUS_ERROR) {\n";
-      pr "    error (g, \"%%s\", state.err.error);\n";
+      pr "    error (g, \"%%s\", state.err.error_message);\n";
       pr "    return %s;\n" error_code;
       pr "  }\n";
       pr "\n";
@@ -2215,7 +2313,7 @@ and generate_client_actions () =
 	   pr "  return state.ret.%s; /* caller will free */\n" n
        | RStringList n | RHashtable n ->
 	   pr "  /* caller will free this, but we need to add a NULL entry */\n";
-	   pr "  state.ret.%s.%s_val =" n n;
+	   pr "  state.ret.%s.%s_val =\n" n n;
 	   pr "    safe_realloc (g, state.ret.%s.%s_val,\n" n n;
 	   pr "                  sizeof (char *) * (state.ret.%s.%s_len + 1));\n"
 	     n n;
diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c
index 6f01f9f2..fbe3a725 100644
--- a/src/guestfs-actions.c
+++ b/src/guestfs-actions.c
@@ -19,14 +19,79 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "guestfs.h"
+#include "guestfs_protocol.h"
+
+#define error guestfs_error
+#define perrorf guestfs_perrorf
+#define safe_malloc guestfs_safe_malloc
+#define safe_realloc guestfs_safe_realloc
+#define safe_strdup guestfs_safe_strdup
+#define safe_memdup guestfs_safe_memdup
+
+/* Check the return message from a call for validity. */
+static int
+check_reply_header (guestfs_h *g,
+                    const struct guestfs_message_header *hdr,
+                    int proc_nr, int serial)
+{
+  if (hdr->prog != GUESTFS_PROGRAM) {
+    error (g, "wrong program (%d/%d)", hdr->prog, GUESTFS_PROGRAM);
+    return -1;
+  }
+  if (hdr->vers != GUESTFS_PROTOCOL_VERSION) {
+    error (g, "wrong protocol version (%d/%d)",
+	   hdr->vers, GUESTFS_PROTOCOL_VERSION);
+    return -1;
+  }
+  if (hdr->direction != GUESTFS_DIRECTION_REPLY) {
+    error (g, "unexpected message direction (%d/%d)",
+	   hdr->direction, GUESTFS_DIRECTION_REPLY);
+    return -1;
+  }
+  if (hdr->proc != proc_nr) {
+    error (g, "unexpected procedure number (%d/%d)", hdr->proc, proc_nr);
+    return -1;
+  }
+  if (hdr->serial != serial) {
+    error (g, "unexpected serial (%d/%d)", hdr->serial, serial);
+    return -1;
+  }
+
+  return 0;
+}
+
+/* Check we are in the right state to run a high-level action. */
+static int
+check_state (guestfs_h *g, const char *caller)
+{
+  if (!guestfs_is_ready (g)) {
+    if (guestfs_is_config (g))
+      error (g, "%s: call launch() before using this function",
+        caller);
+    else if (guestfs_is_launching (g))
+      error (g, "%s: call wait_ready() before using this function",
+        caller);
+    else
+      error (g, "%s called from the wrong state, %d != READY",
+        caller, guestfs_get_state (g));
+    return -1;
+  }
+  return 0;
+}
+
 struct mount_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void mount_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mount_state *state = (struct mount_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -41,8 +106,8 @@ static void mount_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_mount (guestfs_h *g,
@@ -51,37 +116,25 @@ int guestfs_mount (guestfs_h *g,
 {
   struct guestfs_mount_args args;
   struct mount_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_mount");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_mount");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_mount", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_mount") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
   args.mountpoint = (char *) mountpoint;
-  serial = dispatch (g, GUESTFS_PROC_MOUNT,
+  serial = guestfs_send (g, GUESTFS_PROC_MOUNT,
                      (xdrproc_t) xdr_guestfs_mount_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = mount_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, mount_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_mount failed, see earlier error messages");
     return -1;
   }
@@ -90,7 +143,7 @@ int guestfs_mount (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -98,13 +151,14 @@ int guestfs_mount (guestfs_h *g,
 }
 
 struct sync_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void sync_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct sync_state *state = (struct sync_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -119,41 +173,29 @@ static void sync_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_sync (guestfs_h *g)
 {
   struct sync_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_sync");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_sync");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_sync", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_sync") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_SYNC, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_SYNC, NULL, NULL);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = sync_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, sync_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_sync failed, see earlier error messages");
     return -1;
   }
@@ -162,7 +204,7 @@ int guestfs_sync (guestfs_h *g)
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -170,13 +212,14 @@ int guestfs_sync (guestfs_h *g)
 }
 
 struct touch_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void touch_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct touch_state *state = (struct touch_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -191,8 +234,8 @@ static void touch_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_touch (guestfs_h *g,
@@ -200,36 +243,24 @@ int guestfs_touch (guestfs_h *g,
 {
   struct guestfs_touch_args args;
   struct touch_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_touch");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_touch");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_touch", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_touch") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_TOUCH,
+  serial = guestfs_send (g, GUESTFS_PROC_TOUCH,
                      (xdrproc_t) xdr_guestfs_touch_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = touch_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, touch_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_touch failed, see earlier error messages");
     return -1;
   }
@@ -238,7 +269,7 @@ int guestfs_touch (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -246,7 +277,7 @@ int guestfs_touch (guestfs_h *g,
 }
 
 struct cat_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_cat_ret ret;
@@ -254,6 +285,7 @@ struct cat_state {
 
 static void cat_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct cat_state *state = (struct cat_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -272,8 +304,8 @@ static void cat_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char *guestfs_cat (guestfs_h *g,
@@ -281,36 +313,24 @@ char *guestfs_cat (guestfs_h *g,
 {
   struct guestfs_cat_args args;
   struct cat_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_cat");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_cat");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_cat", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_cat") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_CAT,
+  serial = guestfs_send (g, GUESTFS_PROC_CAT,
                      (xdrproc_t) xdr_guestfs_cat_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = cat_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, cat_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_cat failed, see earlier error messages");
     return NULL;
   }
@@ -319,7 +339,7 @@ char *guestfs_cat (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -327,7 +347,7 @@ char *guestfs_cat (guestfs_h *g,
 }
 
 struct ll_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_ll_ret ret;
@@ -335,6 +355,7 @@ struct ll_state {
 
 static void ll_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct ll_state *state = (struct ll_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -353,8 +374,8 @@ static void ll_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char *guestfs_ll (guestfs_h *g,
@@ -362,36 +383,24 @@ char *guestfs_ll (guestfs_h *g,
 {
   struct guestfs_ll_args args;
   struct ll_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_ll");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_ll");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_ll", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_ll") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.directory = (char *) directory;
-  serial = dispatch (g, GUESTFS_PROC_LL,
+  serial = guestfs_send (g, GUESTFS_PROC_LL,
                      (xdrproc_t) xdr_guestfs_ll_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = ll_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, ll_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_ll failed, see earlier error messages");
     return NULL;
   }
@@ -400,7 +409,7 @@ char *guestfs_ll (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -408,7 +417,7 @@ char *guestfs_ll (guestfs_h *g,
 }
 
 struct ls_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_ls_ret ret;
@@ -416,6 +425,7 @@ struct ls_state {
 
 static void ls_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct ls_state *state = (struct ls_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -434,8 +444,8 @@ static void ls_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_ls (guestfs_h *g,
@@ -443,36 +453,24 @@ char **guestfs_ls (guestfs_h *g,
 {
   struct guestfs_ls_args args;
   struct ls_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_ls");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_ls");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_ls", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_ls") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.directory = (char *) directory;
-  serial = dispatch (g, GUESTFS_PROC_LS,
+  serial = guestfs_send (g, GUESTFS_PROC_LS,
                      (xdrproc_t) xdr_guestfs_ls_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = ls_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, ls_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_ls failed, see earlier error messages");
     return NULL;
   }
@@ -481,19 +479,20 @@ char **guestfs_ls (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.listing.listing_val =    safe_realloc (g, state.ret.listing.listing_val,
+  state.ret.listing.listing_val =
+    safe_realloc (g, state.ret.listing.listing_val,
                   sizeof (char *) * (state.ret.listing.listing_len + 1));
   state.ret.listing.listing_val[state.ret.listing.listing_len] = NULL;
   return state.ret.listing.listing_val;
 }
 
 struct list_devices_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_list_devices_ret ret;
@@ -501,6 +500,7 @@ struct list_devices_state {
 
 static void list_devices_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct list_devices_state *state = (struct list_devices_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -519,41 +519,29 @@ static void list_devices_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_list_devices (guestfs_h *g)
 {
   struct list_devices_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_list_devices");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_list_devices");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_list_devices", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_list_devices") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_LIST_DEVICES, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_LIST_DEVICES, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = list_devices_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, list_devices_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_list_devices failed, see earlier error messages");
     return NULL;
   }
@@ -562,19 +550,20 @@ char **guestfs_list_devices (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.devices.devices_val =    safe_realloc (g, state.ret.devices.devices_val,
+  state.ret.devices.devices_val =
+    safe_realloc (g, state.ret.devices.devices_val,
                   sizeof (char *) * (state.ret.devices.devices_len + 1));
   state.ret.devices.devices_val[state.ret.devices.devices_len] = NULL;
   return state.ret.devices.devices_val;
 }
 
 struct list_partitions_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_list_partitions_ret ret;
@@ -582,6 +571,7 @@ struct list_partitions_state {
 
 static void list_partitions_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct list_partitions_state *state = (struct list_partitions_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -600,41 +590,29 @@ static void list_partitions_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_list_partitions (guestfs_h *g)
 {
   struct list_partitions_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_list_partitions");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_list_partitions");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_list_partitions", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_list_partitions") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_LIST_PARTITIONS, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_LIST_PARTITIONS, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = list_partitions_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, list_partitions_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_list_partitions failed, see earlier error messages");
     return NULL;
   }
@@ -643,19 +621,20 @@ char **guestfs_list_partitions (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.partitions.partitions_val =    safe_realloc (g, state.ret.partitions.partitions_val,
+  state.ret.partitions.partitions_val =
+    safe_realloc (g, state.ret.partitions.partitions_val,
                   sizeof (char *) * (state.ret.partitions.partitions_len + 1));
   state.ret.partitions.partitions_val[state.ret.partitions.partitions_len] = NULL;
   return state.ret.partitions.partitions_val;
 }
 
 struct pvs_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_pvs_ret ret;
@@ -663,6 +642,7 @@ struct pvs_state {
 
 static void pvs_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct pvs_state *state = (struct pvs_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -681,41 +661,29 @@ static void pvs_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_pvs (guestfs_h *g)
 {
   struct pvs_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_pvs");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_pvs");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_pvs", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_pvs") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_PVS, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_PVS, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = pvs_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, pvs_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_pvs failed, see earlier error messages");
     return NULL;
   }
@@ -724,19 +692,20 @@ char **guestfs_pvs (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.physvols.physvols_val =    safe_realloc (g, state.ret.physvols.physvols_val,
+  state.ret.physvols.physvols_val =
+    safe_realloc (g, state.ret.physvols.physvols_val,
                   sizeof (char *) * (state.ret.physvols.physvols_len + 1));
   state.ret.physvols.physvols_val[state.ret.physvols.physvols_len] = NULL;
   return state.ret.physvols.physvols_val;
 }
 
 struct vgs_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_vgs_ret ret;
@@ -744,6 +713,7 @@ struct vgs_state {
 
 static void vgs_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct vgs_state *state = (struct vgs_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -762,41 +732,29 @@ static void vgs_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_vgs (guestfs_h *g)
 {
   struct vgs_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_vgs");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_vgs");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_vgs", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_vgs") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_VGS, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_VGS, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = vgs_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, vgs_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_vgs failed, see earlier error messages");
     return NULL;
   }
@@ -805,19 +763,20 @@ char **guestfs_vgs (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.volgroups.volgroups_val =    safe_realloc (g, state.ret.volgroups.volgroups_val,
+  state.ret.volgroups.volgroups_val =
+    safe_realloc (g, state.ret.volgroups.volgroups_val,
                   sizeof (char *) * (state.ret.volgroups.volgroups_len + 1));
   state.ret.volgroups.volgroups_val[state.ret.volgroups.volgroups_len] = NULL;
   return state.ret.volgroups.volgroups_val;
 }
 
 struct lvs_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_lvs_ret ret;
@@ -825,6 +784,7 @@ struct lvs_state {
 
 static void lvs_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvs_state *state = (struct lvs_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -843,41 +803,29 @@ static void lvs_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_lvs (guestfs_h *g)
 {
   struct lvs_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_lvs");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_lvs");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_lvs", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_lvs") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_LVS, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_LVS, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = lvs_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, lvs_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_lvs failed, see earlier error messages");
     return NULL;
   }
@@ -886,19 +834,20 @@ char **guestfs_lvs (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.logvols.logvols_val =    safe_realloc (g, state.ret.logvols.logvols_val,
+  state.ret.logvols.logvols_val =
+    safe_realloc (g, state.ret.logvols.logvols_val,
                   sizeof (char *) * (state.ret.logvols.logvols_len + 1));
   state.ret.logvols.logvols_val[state.ret.logvols.logvols_len] = NULL;
   return state.ret.logvols.logvols_val;
 }
 
 struct pvs_full_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_pvs_full_ret ret;
@@ -906,6 +855,7 @@ struct pvs_full_state {
 
 static void pvs_full_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct pvs_full_state *state = (struct pvs_full_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -924,41 +874,29 @@ static void pvs_full_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
 {
   struct pvs_full_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_pvs_full");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_pvs_full");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_pvs_full", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_pvs_full") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_PVS_FULL, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_PVS_FULL, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = pvs_full_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, pvs_full_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_pvs_full failed, see earlier error messages");
     return NULL;
   }
@@ -967,7 +905,7 @@ struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -976,7 +914,7 @@ struct guestfs_lvm_pv_list *guestfs_pvs_full (guestfs_h *g)
 }
 
 struct vgs_full_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_vgs_full_ret ret;
@@ -984,6 +922,7 @@ struct vgs_full_state {
 
 static void vgs_full_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct vgs_full_state *state = (struct vgs_full_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1002,41 +941,29 @@ static void vgs_full_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
 {
   struct vgs_full_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_vgs_full");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_vgs_full");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_vgs_full", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_vgs_full") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_VGS_FULL, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_VGS_FULL, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = vgs_full_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, vgs_full_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_vgs_full failed, see earlier error messages");
     return NULL;
   }
@@ -1045,7 +972,7 @@ struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -1054,7 +981,7 @@ struct guestfs_lvm_vg_list *guestfs_vgs_full (guestfs_h *g)
 }
 
 struct lvs_full_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_lvs_full_ret ret;
@@ -1062,6 +989,7 @@ struct lvs_full_state {
 
 static void lvs_full_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvs_full_state *state = (struct lvs_full_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1080,41 +1008,29 @@ static void lvs_full_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
 {
   struct lvs_full_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_lvs_full");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_lvs_full");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_lvs_full", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_lvs_full") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_LVS_FULL, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_LVS_FULL, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = lvs_full_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, lvs_full_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_lvs_full failed, see earlier error messages");
     return NULL;
   }
@@ -1123,7 +1039,7 @@ struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -1132,7 +1048,7 @@ struct guestfs_lvm_lv_list *guestfs_lvs_full (guestfs_h *g)
 }
 
 struct read_lines_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_read_lines_ret ret;
@@ -1140,6 +1056,7 @@ struct read_lines_state {
 
 static void read_lines_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct read_lines_state *state = (struct read_lines_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1158,8 +1075,8 @@ static void read_lines_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_read_lines (guestfs_h *g,
@@ -1167,36 +1084,24 @@ char **guestfs_read_lines (guestfs_h *g,
 {
   struct guestfs_read_lines_args args;
   struct read_lines_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_read_lines");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_read_lines");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_read_lines", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_read_lines") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_READ_LINES,
+  serial = guestfs_send (g, GUESTFS_PROC_READ_LINES,
                      (xdrproc_t) xdr_guestfs_read_lines_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = read_lines_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, read_lines_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_read_lines failed, see earlier error messages");
     return NULL;
   }
@@ -1205,25 +1110,27 @@ char **guestfs_read_lines (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.lines.lines_val =    safe_realloc (g, state.ret.lines.lines_val,
+  state.ret.lines.lines_val =
+    safe_realloc (g, state.ret.lines.lines_val,
                   sizeof (char *) * (state.ret.lines.lines_len + 1));
   state.ret.lines.lines_val[state.ret.lines.lines_len] = NULL;
   return state.ret.lines.lines_val;
 }
 
 struct aug_init_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void aug_init_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_init_state *state = (struct aug_init_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1238,8 +1145,8 @@ static void aug_init_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_init (guestfs_h *g,
@@ -1248,37 +1155,25 @@ int guestfs_aug_init (guestfs_h *g,
 {
   struct guestfs_aug_init_args args;
   struct aug_init_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_init");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_init");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_init", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_init") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.root = (char *) root;
   args.flags = flags;
-  serial = dispatch (g, GUESTFS_PROC_AUG_INIT,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_INIT,
                      (xdrproc_t) xdr_guestfs_aug_init_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_init_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_init_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_init failed, see earlier error messages");
     return -1;
   }
@@ -1287,7 +1182,7 @@ int guestfs_aug_init (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -1295,13 +1190,14 @@ int guestfs_aug_init (guestfs_h *g,
 }
 
 struct aug_close_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void aug_close_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_close_state *state = (struct aug_close_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1316,41 +1212,29 @@ static void aug_close_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_close (guestfs_h *g)
 {
   struct aug_close_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_close");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_close");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_close", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_close") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_AUG_CLOSE, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_CLOSE, NULL, NULL);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_close_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_close_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_close failed, see earlier error messages");
     return -1;
   }
@@ -1359,7 +1243,7 @@ int guestfs_aug_close (guestfs_h *g)
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -1367,7 +1251,7 @@ int guestfs_aug_close (guestfs_h *g)
 }
 
 struct aug_defvar_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_aug_defvar_ret ret;
@@ -1375,6 +1259,7 @@ struct aug_defvar_state {
 
 static void aug_defvar_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_defvar_state *state = (struct aug_defvar_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1393,8 +1278,8 @@ static void aug_defvar_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_defvar (guestfs_h *g,
@@ -1403,37 +1288,25 @@ int guestfs_aug_defvar (guestfs_h *g,
 {
   struct guestfs_aug_defvar_args args;
   struct aug_defvar_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_defvar");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_defvar");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_defvar", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_defvar") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.name = (char *) name;
   args.expr = expr ? (char **) &expr : NULL;
-  serial = dispatch (g, GUESTFS_PROC_AUG_DEFVAR,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_DEFVAR,
                      (xdrproc_t) xdr_guestfs_aug_defvar_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_defvar_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_defvar_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_defvar failed, see earlier error messages");
     return -1;
   }
@@ -1442,7 +1315,7 @@ int guestfs_aug_defvar (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -1450,7 +1323,7 @@ int guestfs_aug_defvar (guestfs_h *g,
 }
 
 struct aug_defnode_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_aug_defnode_ret ret;
@@ -1458,6 +1331,7 @@ struct aug_defnode_state {
 
 static void aug_defnode_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_defnode_state *state = (struct aug_defnode_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1476,8 +1350,8 @@ static void aug_defnode_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
@@ -1487,38 +1361,26 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
 {
   struct guestfs_aug_defnode_args args;
   struct aug_defnode_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_defnode");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_defnode");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_defnode", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_aug_defnode") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.name = (char *) name;
   args.expr = (char *) expr;
   args.val = (char *) val;
-  serial = dispatch (g, GUESTFS_PROC_AUG_DEFNODE,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_DEFNODE,
                      (xdrproc_t) xdr_guestfs_aug_defnode_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_defnode_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_defnode_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_defnode failed, see earlier error messages");
     return NULL;
   }
@@ -1527,7 +1389,7 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -1536,7 +1398,7 @@ struct guestfs_int_bool *guestfs_aug_defnode (guestfs_h *g,
 }
 
 struct aug_get_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_aug_get_ret ret;
@@ -1544,6 +1406,7 @@ struct aug_get_state {
 
 static void aug_get_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_get_state *state = (struct aug_get_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1562,8 +1425,8 @@ static void aug_get_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char *guestfs_aug_get (guestfs_h *g,
@@ -1571,36 +1434,24 @@ char *guestfs_aug_get (guestfs_h *g,
 {
   struct guestfs_aug_get_args args;
   struct aug_get_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_get");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_get");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_get", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_aug_get") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_AUG_GET,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_GET,
                      (xdrproc_t) xdr_guestfs_aug_get_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_get_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_get_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_get failed, see earlier error messages");
     return NULL;
   }
@@ -1609,7 +1460,7 @@ char *guestfs_aug_get (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -1617,13 +1468,14 @@ char *guestfs_aug_get (guestfs_h *g,
 }
 
 struct aug_set_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void aug_set_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_set_state *state = (struct aug_set_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1638,8 +1490,8 @@ static void aug_set_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_set (guestfs_h *g,
@@ -1648,37 +1500,25 @@ int guestfs_aug_set (guestfs_h *g,
 {
   struct guestfs_aug_set_args args;
   struct aug_set_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_set");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_set");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_set", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_set") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
   args.val = (char *) val;
-  serial = dispatch (g, GUESTFS_PROC_AUG_SET,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_SET,
                      (xdrproc_t) xdr_guestfs_aug_set_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_set_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_set_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_set failed, see earlier error messages");
     return -1;
   }
@@ -1687,7 +1527,7 @@ int guestfs_aug_set (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -1695,13 +1535,14 @@ int guestfs_aug_set (guestfs_h *g,
 }
 
 struct aug_insert_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void aug_insert_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_insert_state *state = (struct aug_insert_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1716,8 +1557,8 @@ static void aug_insert_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_insert (guestfs_h *g,
@@ -1727,38 +1568,26 @@ int guestfs_aug_insert (guestfs_h *g,
 {
   struct guestfs_aug_insert_args args;
   struct aug_insert_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_insert");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_insert");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_insert", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_insert") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
   args.label = (char *) label;
   args.before = before;
-  serial = dispatch (g, GUESTFS_PROC_AUG_INSERT,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_INSERT,
                      (xdrproc_t) xdr_guestfs_aug_insert_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_insert_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_insert_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_insert failed, see earlier error messages");
     return -1;
   }
@@ -1767,7 +1596,7 @@ int guestfs_aug_insert (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -1775,7 +1604,7 @@ int guestfs_aug_insert (guestfs_h *g,
 }
 
 struct aug_rm_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_aug_rm_ret ret;
@@ -1783,6 +1612,7 @@ struct aug_rm_state {
 
 static void aug_rm_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_rm_state *state = (struct aug_rm_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1801,8 +1631,8 @@ static void aug_rm_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_rm (guestfs_h *g,
@@ -1810,36 +1640,24 @@ int guestfs_aug_rm (guestfs_h *g,
 {
   struct guestfs_aug_rm_args args;
   struct aug_rm_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_rm");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_rm");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_rm", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_rm") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_AUG_RM,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_RM,
                      (xdrproc_t) xdr_guestfs_aug_rm_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_rm_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_rm_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_rm failed, see earlier error messages");
     return -1;
   }
@@ -1848,7 +1666,7 @@ int guestfs_aug_rm (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -1856,13 +1674,14 @@ int guestfs_aug_rm (guestfs_h *g,
 }
 
 struct aug_mv_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void aug_mv_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_mv_state *state = (struct aug_mv_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1877,8 +1696,8 @@ static void aug_mv_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_mv (guestfs_h *g,
@@ -1887,37 +1706,25 @@ int guestfs_aug_mv (guestfs_h *g,
 {
   struct guestfs_aug_mv_args args;
   struct aug_mv_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_mv");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_mv");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_mv", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_mv") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.src = (char *) src;
   args.dest = (char *) dest;
-  serial = dispatch (g, GUESTFS_PROC_AUG_MV,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_MV,
                      (xdrproc_t) xdr_guestfs_aug_mv_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_mv_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_mv_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_mv failed, see earlier error messages");
     return -1;
   }
@@ -1926,7 +1733,7 @@ int guestfs_aug_mv (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -1934,7 +1741,7 @@ int guestfs_aug_mv (guestfs_h *g,
 }
 
 struct aug_match_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_aug_match_ret ret;
@@ -1942,6 +1749,7 @@ struct aug_match_state {
 
 static void aug_match_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_match_state *state = (struct aug_match_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -1960,8 +1768,8 @@ static void aug_match_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_aug_match (guestfs_h *g,
@@ -1969,36 +1777,24 @@ char **guestfs_aug_match (guestfs_h *g,
 {
   struct guestfs_aug_match_args args;
   struct aug_match_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_match");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_match");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_match", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_aug_match") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_AUG_MATCH,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_MATCH,
                      (xdrproc_t) xdr_guestfs_aug_match_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_match_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_match_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_match failed, see earlier error messages");
     return NULL;
   }
@@ -2007,25 +1803,27 @@ char **guestfs_aug_match (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.matches.matches_val =    safe_realloc (g, state.ret.matches.matches_val,
+  state.ret.matches.matches_val =
+    safe_realloc (g, state.ret.matches.matches_val,
                   sizeof (char *) * (state.ret.matches.matches_len + 1));
   state.ret.matches.matches_val[state.ret.matches.matches_len] = NULL;
   return state.ret.matches.matches_val;
 }
 
 struct aug_save_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void aug_save_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_save_state *state = (struct aug_save_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2040,41 +1838,29 @@ static void aug_save_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_save (guestfs_h *g)
 {
   struct aug_save_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_save");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_save");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_save", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_save") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_AUG_SAVE, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_SAVE, NULL, NULL);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_save_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_save_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_save failed, see earlier error messages");
     return -1;
   }
@@ -2083,7 +1869,7 @@ int guestfs_aug_save (guestfs_h *g)
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2091,13 +1877,14 @@ int guestfs_aug_save (guestfs_h *g)
 }
 
 struct aug_load_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void aug_load_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_load_state *state = (struct aug_load_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2112,41 +1899,29 @@ static void aug_load_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_aug_load (guestfs_h *g)
 {
   struct aug_load_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_load");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_load");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_load", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_aug_load") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_AUG_LOAD, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_LOAD, NULL, NULL);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_load_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_load_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_load failed, see earlier error messages");
     return -1;
   }
@@ -2155,7 +1930,7 @@ int guestfs_aug_load (guestfs_h *g)
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2163,7 +1938,7 @@ int guestfs_aug_load (guestfs_h *g)
 }
 
 struct aug_ls_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_aug_ls_ret ret;
@@ -2171,6 +1946,7 @@ struct aug_ls_state {
 
 static void aug_ls_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct aug_ls_state *state = (struct aug_ls_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2189,8 +1965,8 @@ static void aug_ls_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_aug_ls (guestfs_h *g,
@@ -2198,36 +1974,24 @@ char **guestfs_aug_ls (guestfs_h *g,
 {
   struct guestfs_aug_ls_args args;
   struct aug_ls_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_aug_ls");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_aug_ls");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_aug_ls", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_aug_ls") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_AUG_LS,
+  serial = guestfs_send (g, GUESTFS_PROC_AUG_LS,
                      (xdrproc_t) xdr_guestfs_aug_ls_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = aug_ls_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, aug_ls_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_aug_ls failed, see earlier error messages");
     return NULL;
   }
@@ -2236,25 +2000,27 @@ char **guestfs_aug_ls (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.matches.matches_val =    safe_realloc (g, state.ret.matches.matches_val,
+  state.ret.matches.matches_val =
+    safe_realloc (g, state.ret.matches.matches_val,
                   sizeof (char *) * (state.ret.matches.matches_len + 1));
   state.ret.matches.matches_val[state.ret.matches.matches_len] = NULL;
   return state.ret.matches.matches_val;
 }
 
 struct rm_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void rm_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct rm_state *state = (struct rm_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2269,8 +2035,8 @@ static void rm_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_rm (guestfs_h *g,
@@ -2278,36 +2044,24 @@ int guestfs_rm (guestfs_h *g,
 {
   struct guestfs_rm_args args;
   struct rm_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_rm");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_rm");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_rm", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_rm") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_RM,
+  serial = guestfs_send (g, GUESTFS_PROC_RM,
                      (xdrproc_t) xdr_guestfs_rm_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = rm_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, rm_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_rm failed, see earlier error messages");
     return -1;
   }
@@ -2316,7 +2070,7 @@ int guestfs_rm (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2324,13 +2078,14 @@ int guestfs_rm (guestfs_h *g,
 }
 
 struct rmdir_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void rmdir_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct rmdir_state *state = (struct rmdir_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2345,8 +2100,8 @@ static void rmdir_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_rmdir (guestfs_h *g,
@@ -2354,36 +2109,24 @@ int guestfs_rmdir (guestfs_h *g,
 {
   struct guestfs_rmdir_args args;
   struct rmdir_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_rmdir");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_rmdir");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_rmdir", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_rmdir") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_RMDIR,
+  serial = guestfs_send (g, GUESTFS_PROC_RMDIR,
                      (xdrproc_t) xdr_guestfs_rmdir_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = rmdir_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, rmdir_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_rmdir failed, see earlier error messages");
     return -1;
   }
@@ -2392,7 +2135,7 @@ int guestfs_rmdir (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2400,13 +2143,14 @@ int guestfs_rmdir (guestfs_h *g,
 }
 
 struct rm_rf_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void rm_rf_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct rm_rf_state *state = (struct rm_rf_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2421,8 +2165,8 @@ static void rm_rf_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_rm_rf (guestfs_h *g,
@@ -2430,36 +2174,24 @@ int guestfs_rm_rf (guestfs_h *g,
 {
   struct guestfs_rm_rf_args args;
   struct rm_rf_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_rm_rf");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_rm_rf");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_rm_rf", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_rm_rf") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_RM_RF,
+  serial = guestfs_send (g, GUESTFS_PROC_RM_RF,
                      (xdrproc_t) xdr_guestfs_rm_rf_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = rm_rf_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, rm_rf_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_rm_rf failed, see earlier error messages");
     return -1;
   }
@@ -2468,7 +2200,7 @@ int guestfs_rm_rf (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2476,13 +2208,14 @@ int guestfs_rm_rf (guestfs_h *g,
 }
 
 struct mkdir_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void mkdir_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mkdir_state *state = (struct mkdir_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2497,8 +2230,8 @@ static void mkdir_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_mkdir (guestfs_h *g,
@@ -2506,36 +2239,24 @@ int guestfs_mkdir (guestfs_h *g,
 {
   struct guestfs_mkdir_args args;
   struct mkdir_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_mkdir");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_mkdir");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_mkdir", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_mkdir") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_MKDIR,
+  serial = guestfs_send (g, GUESTFS_PROC_MKDIR,
                      (xdrproc_t) xdr_guestfs_mkdir_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = mkdir_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, mkdir_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_mkdir failed, see earlier error messages");
     return -1;
   }
@@ -2544,7 +2265,7 @@ int guestfs_mkdir (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2552,13 +2273,14 @@ int guestfs_mkdir (guestfs_h *g,
 }
 
 struct mkdir_p_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void mkdir_p_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mkdir_p_state *state = (struct mkdir_p_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2573,8 +2295,8 @@ static void mkdir_p_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_mkdir_p (guestfs_h *g,
@@ -2582,36 +2304,24 @@ int guestfs_mkdir_p (guestfs_h *g,
 {
   struct guestfs_mkdir_p_args args;
   struct mkdir_p_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_mkdir_p");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_mkdir_p");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_mkdir_p", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_mkdir_p") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_MKDIR_P,
+  serial = guestfs_send (g, GUESTFS_PROC_MKDIR_P,
                      (xdrproc_t) xdr_guestfs_mkdir_p_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = mkdir_p_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, mkdir_p_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_mkdir_p failed, see earlier error messages");
     return -1;
   }
@@ -2620,7 +2330,7 @@ int guestfs_mkdir_p (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2628,13 +2338,14 @@ int guestfs_mkdir_p (guestfs_h *g,
 }
 
 struct chmod_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void chmod_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct chmod_state *state = (struct chmod_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2649,8 +2360,8 @@ static void chmod_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_chmod (guestfs_h *g,
@@ -2659,37 +2370,25 @@ int guestfs_chmod (guestfs_h *g,
 {
   struct guestfs_chmod_args args;
   struct chmod_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_chmod");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_chmod");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_chmod", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_chmod") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.mode = mode;
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_CHMOD,
+  serial = guestfs_send (g, GUESTFS_PROC_CHMOD,
                      (xdrproc_t) xdr_guestfs_chmod_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = chmod_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, chmod_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_chmod failed, see earlier error messages");
     return -1;
   }
@@ -2698,7 +2397,7 @@ int guestfs_chmod (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2706,13 +2405,14 @@ int guestfs_chmod (guestfs_h *g,
 }
 
 struct chown_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void chown_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct chown_state *state = (struct chown_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2727,8 +2427,8 @@ static void chown_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_chown (guestfs_h *g,
@@ -2738,38 +2438,26 @@ int guestfs_chown (guestfs_h *g,
 {
   struct guestfs_chown_args args;
   struct chown_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_chown");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_chown");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_chown", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_chown") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.owner = owner;
   args.group = group;
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_CHOWN,
+  serial = guestfs_send (g, GUESTFS_PROC_CHOWN,
                      (xdrproc_t) xdr_guestfs_chown_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = chown_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, chown_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_chown failed, see earlier error messages");
     return -1;
   }
@@ -2778,7 +2466,7 @@ int guestfs_chown (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2786,7 +2474,7 @@ int guestfs_chown (guestfs_h *g,
 }
 
 struct exists_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_exists_ret ret;
@@ -2794,6 +2482,7 @@ struct exists_state {
 
 static void exists_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct exists_state *state = (struct exists_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2812,8 +2501,8 @@ static void exists_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_exists (guestfs_h *g,
@@ -2821,36 +2510,24 @@ int guestfs_exists (guestfs_h *g,
 {
   struct guestfs_exists_args args;
   struct exists_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_exists");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_exists");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_exists", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_exists") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_EXISTS,
+  serial = guestfs_send (g, GUESTFS_PROC_EXISTS,
                      (xdrproc_t) xdr_guestfs_exists_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = exists_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, exists_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_exists failed, see earlier error messages");
     return -1;
   }
@@ -2859,7 +2536,7 @@ int guestfs_exists (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2867,7 +2544,7 @@ int guestfs_exists (guestfs_h *g,
 }
 
 struct is_file_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_is_file_ret ret;
@@ -2875,6 +2552,7 @@ struct is_file_state {
 
 static void is_file_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct is_file_state *state = (struct is_file_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2893,8 +2571,8 @@ static void is_file_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_is_file (guestfs_h *g,
@@ -2902,36 +2580,24 @@ int guestfs_is_file (guestfs_h *g,
 {
   struct guestfs_is_file_args args;
   struct is_file_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_is_file");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_is_file");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_is_file", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_is_file") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_IS_FILE,
+  serial = guestfs_send (g, GUESTFS_PROC_IS_FILE,
                      (xdrproc_t) xdr_guestfs_is_file_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = is_file_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, is_file_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_is_file failed, see earlier error messages");
     return -1;
   }
@@ -2940,7 +2606,7 @@ int guestfs_is_file (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -2948,7 +2614,7 @@ int guestfs_is_file (guestfs_h *g,
 }
 
 struct is_dir_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_is_dir_ret ret;
@@ -2956,6 +2622,7 @@ struct is_dir_state {
 
 static void is_dir_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct is_dir_state *state = (struct is_dir_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -2974,8 +2641,8 @@ static void is_dir_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_is_dir (guestfs_h *g,
@@ -2983,36 +2650,24 @@ int guestfs_is_dir (guestfs_h *g,
 {
   struct guestfs_is_dir_args args;
   struct is_dir_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_is_dir");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_is_dir");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_is_dir", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_is_dir") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_IS_DIR,
+  serial = guestfs_send (g, GUESTFS_PROC_IS_DIR,
                      (xdrproc_t) xdr_guestfs_is_dir_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = is_dir_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, is_dir_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_is_dir failed, see earlier error messages");
     return -1;
   }
@@ -3021,7 +2676,7 @@ int guestfs_is_dir (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3029,13 +2684,14 @@ int guestfs_is_dir (guestfs_h *g,
 }
 
 struct pvcreate_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void pvcreate_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct pvcreate_state *state = (struct pvcreate_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3050,8 +2706,8 @@ static void pvcreate_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_pvcreate (guestfs_h *g,
@@ -3059,36 +2715,24 @@ int guestfs_pvcreate (guestfs_h *g,
 {
   struct guestfs_pvcreate_args args;
   struct pvcreate_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_pvcreate");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_pvcreate");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_pvcreate", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_pvcreate") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_PVCREATE,
+  serial = guestfs_send (g, GUESTFS_PROC_PVCREATE,
                      (xdrproc_t) xdr_guestfs_pvcreate_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = pvcreate_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, pvcreate_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_pvcreate failed, see earlier error messages");
     return -1;
   }
@@ -3097,7 +2741,7 @@ int guestfs_pvcreate (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3105,13 +2749,14 @@ int guestfs_pvcreate (guestfs_h *g,
 }
 
 struct vgcreate_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void vgcreate_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct vgcreate_state *state = (struct vgcreate_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3126,8 +2771,8 @@ static void vgcreate_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_vgcreate (guestfs_h *g,
@@ -3136,38 +2781,26 @@ int guestfs_vgcreate (guestfs_h *g,
 {
   struct guestfs_vgcreate_args args;
   struct vgcreate_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_vgcreate");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_vgcreate");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_vgcreate", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_vgcreate") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   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 = dispatch (g, GUESTFS_PROC_VGCREATE,
+  serial = guestfs_send (g, GUESTFS_PROC_VGCREATE,
                      (xdrproc_t) xdr_guestfs_vgcreate_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = vgcreate_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, vgcreate_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_vgcreate failed, see earlier error messages");
     return -1;
   }
@@ -3176,7 +2809,7 @@ int guestfs_vgcreate (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3184,13 +2817,14 @@ int guestfs_vgcreate (guestfs_h *g,
 }
 
 struct lvcreate_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void lvcreate_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvcreate_state *state = (struct lvcreate_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3205,8 +2839,8 @@ static void lvcreate_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_lvcreate (guestfs_h *g,
@@ -3216,38 +2850,26 @@ int guestfs_lvcreate (guestfs_h *g,
 {
   struct guestfs_lvcreate_args args;
   struct lvcreate_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_lvcreate");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_lvcreate");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_lvcreate", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_lvcreate") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.logvol = (char *) logvol;
   args.volgroup = (char *) volgroup;
   args.mbytes = mbytes;
-  serial = dispatch (g, GUESTFS_PROC_LVCREATE,
+  serial = guestfs_send (g, GUESTFS_PROC_LVCREATE,
                      (xdrproc_t) xdr_guestfs_lvcreate_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = lvcreate_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, lvcreate_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_lvcreate failed, see earlier error messages");
     return -1;
   }
@@ -3256,7 +2878,7 @@ int guestfs_lvcreate (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3264,13 +2886,14 @@ int guestfs_lvcreate (guestfs_h *g,
 }
 
 struct mkfs_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void mkfs_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mkfs_state *state = (struct mkfs_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3285,8 +2908,8 @@ static void mkfs_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_mkfs (guestfs_h *g,
@@ -3295,37 +2918,25 @@ int guestfs_mkfs (guestfs_h *g,
 {
   struct guestfs_mkfs_args args;
   struct mkfs_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_mkfs");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_mkfs");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_mkfs", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_mkfs") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.fstype = (char *) fstype;
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_MKFS,
+  serial = guestfs_send (g, GUESTFS_PROC_MKFS,
                      (xdrproc_t) xdr_guestfs_mkfs_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = mkfs_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, mkfs_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_mkfs failed, see earlier error messages");
     return -1;
   }
@@ -3334,7 +2945,7 @@ int guestfs_mkfs (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3342,13 +2953,14 @@ int guestfs_mkfs (guestfs_h *g,
 }
 
 struct sfdisk_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void sfdisk_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct sfdisk_state *state = (struct sfdisk_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3363,8 +2975,8 @@ static void sfdisk_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_sfdisk (guestfs_h *g,
@@ -3376,20 +2988,10 @@ int guestfs_sfdisk (guestfs_h *g,
 {
   struct guestfs_sfdisk_args args;
   struct sfdisk_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_sfdisk");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_sfdisk");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_sfdisk", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_sfdisk") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
@@ -3399,18 +3001,16 @@ 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 = dispatch (g, GUESTFS_PROC_SFDISK,
+  serial = guestfs_send (g, GUESTFS_PROC_SFDISK,
                      (xdrproc_t) xdr_guestfs_sfdisk_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = sfdisk_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, sfdisk_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_sfdisk failed, see earlier error messages");
     return -1;
   }
@@ -3419,7 +3019,7 @@ int guestfs_sfdisk (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3427,13 +3027,14 @@ int guestfs_sfdisk (guestfs_h *g,
 }
 
 struct write_file_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void write_file_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct write_file_state *state = (struct write_file_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3448,8 +3049,8 @@ static void write_file_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_write_file (guestfs_h *g,
@@ -3459,38 +3060,26 @@ int guestfs_write_file (guestfs_h *g,
 {
   struct guestfs_write_file_args args;
   struct write_file_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_write_file");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_write_file");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_write_file", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_write_file") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
   args.content = (char *) content;
   args.size = size;
-  serial = dispatch (g, GUESTFS_PROC_WRITE_FILE,
+  serial = guestfs_send (g, GUESTFS_PROC_WRITE_FILE,
                      (xdrproc_t) xdr_guestfs_write_file_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = write_file_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, write_file_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_write_file failed, see earlier error messages");
     return -1;
   }
@@ -3499,7 +3088,7 @@ int guestfs_write_file (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3507,13 +3096,14 @@ int guestfs_write_file (guestfs_h *g,
 }
 
 struct umount_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void umount_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct umount_state *state = (struct umount_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3528,8 +3118,8 @@ static void umount_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_umount (guestfs_h *g,
@@ -3537,36 +3127,24 @@ int guestfs_umount (guestfs_h *g,
 {
   struct guestfs_umount_args args;
   struct umount_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_umount");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_umount");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_umount", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_umount") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.pathordevice = (char *) pathordevice;
-  serial = dispatch (g, GUESTFS_PROC_UMOUNT,
+  serial = guestfs_send (g, GUESTFS_PROC_UMOUNT,
                      (xdrproc_t) xdr_guestfs_umount_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = umount_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, umount_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_umount failed, see earlier error messages");
     return -1;
   }
@@ -3575,7 +3153,7 @@ int guestfs_umount (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3583,7 +3161,7 @@ int guestfs_umount (guestfs_h *g,
 }
 
 struct mounts_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_mounts_ret ret;
@@ -3591,6 +3169,7 @@ struct mounts_state {
 
 static void mounts_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct mounts_state *state = (struct mounts_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3609,41 +3188,29 @@ static void mounts_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_mounts (guestfs_h *g)
 {
   struct mounts_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_mounts");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_mounts");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_mounts", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_mounts") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_MOUNTS, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_MOUNTS, NULL, NULL);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = mounts_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, mounts_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_mounts failed, see earlier error messages");
     return NULL;
   }
@@ -3652,25 +3219,27 @@ char **guestfs_mounts (guestfs_h *g)
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.devices.devices_val =    safe_realloc (g, state.ret.devices.devices_val,
+  state.ret.devices.devices_val =
+    safe_realloc (g, state.ret.devices.devices_val,
                   sizeof (char *) * (state.ret.devices.devices_len + 1));
   state.ret.devices.devices_val[state.ret.devices.devices_len] = NULL;
   return state.ret.devices.devices_val;
 }
 
 struct umount_all_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void umount_all_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct umount_all_state *state = (struct umount_all_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3685,41 +3254,29 @@ static void umount_all_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_umount_all (guestfs_h *g)
 {
   struct umount_all_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_umount_all");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_umount_all");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_umount_all", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_umount_all") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_UMOUNT_ALL, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_UMOUNT_ALL, NULL, NULL);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = umount_all_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, umount_all_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_umount_all failed, see earlier error messages");
     return -1;
   }
@@ -3728,7 +3285,7 @@ int guestfs_umount_all (guestfs_h *g)
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3736,13 +3293,14 @@ int guestfs_umount_all (guestfs_h *g)
 }
 
 struct lvm_remove_all_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void lvm_remove_all_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lvm_remove_all_state *state = (struct lvm_remove_all_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3757,41 +3315,29 @@ static void lvm_remove_all_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_lvm_remove_all (guestfs_h *g)
 {
   struct lvm_remove_all_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_lvm_remove_all");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_lvm_remove_all");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_lvm_remove_all", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_lvm_remove_all") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
-  serial = dispatch (g, GUESTFS_PROC_LVM_REMOVE_ALL, NULL, NULL);
+  serial = guestfs_send (g, GUESTFS_PROC_LVM_REMOVE_ALL, NULL, NULL);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = lvm_remove_all_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, lvm_remove_all_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_lvm_remove_all failed, see earlier error messages");
     return -1;
   }
@@ -3800,7 +3346,7 @@ int guestfs_lvm_remove_all (guestfs_h *g)
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -3808,7 +3354,7 @@ int guestfs_lvm_remove_all (guestfs_h *g)
 }
 
 struct file_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_file_ret ret;
@@ -3816,6 +3362,7 @@ struct file_state {
 
 static void file_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct file_state *state = (struct file_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3834,8 +3381,8 @@ static void file_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char *guestfs_file (guestfs_h *g,
@@ -3843,36 +3390,24 @@ char *guestfs_file (guestfs_h *g,
 {
   struct guestfs_file_args args;
   struct file_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_file");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_file");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_file", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_file") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_FILE,
+  serial = guestfs_send (g, GUESTFS_PROC_FILE,
                      (xdrproc_t) xdr_guestfs_file_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = file_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, file_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_file failed, see earlier error messages");
     return NULL;
   }
@@ -3881,7 +3416,7 @@ char *guestfs_file (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -3889,7 +3424,7 @@ char *guestfs_file (guestfs_h *g,
 }
 
 struct command_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_command_ret ret;
@@ -3897,6 +3432,7 @@ struct command_state {
 
 static void command_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct command_state *state = (struct command_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3915,8 +3451,8 @@ static void command_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char *guestfs_command (guestfs_h *g,
@@ -3924,37 +3460,25 @@ char *guestfs_command (guestfs_h *g,
 {
   struct guestfs_command_args args;
   struct command_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_command");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_command");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_command", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_command") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.arguments.arguments_val = (char **) arguments;
   for (args.arguments.arguments_len = 0; arguments[args.arguments.arguments_len]; args.arguments.arguments_len++) ;
-  serial = dispatch (g, GUESTFS_PROC_COMMAND,
+  serial = guestfs_send (g, GUESTFS_PROC_COMMAND,
                      (xdrproc_t) xdr_guestfs_command_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = command_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, command_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_command failed, see earlier error messages");
     return NULL;
   }
@@ -3963,7 +3487,7 @@ char *guestfs_command (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -3971,7 +3495,7 @@ char *guestfs_command (guestfs_h *g,
 }
 
 struct command_lines_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_command_lines_ret ret;
@@ -3979,6 +3503,7 @@ struct command_lines_state {
 
 static void command_lines_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct command_lines_state *state = (struct command_lines_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -3997,8 +3522,8 @@ static void command_lines_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_command_lines (guestfs_h *g,
@@ -4006,37 +3531,25 @@ char **guestfs_command_lines (guestfs_h *g,
 {
   struct guestfs_command_lines_args args;
   struct command_lines_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_command_lines");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_command_lines");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_command_lines", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_command_lines") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.arguments.arguments_val = (char **) arguments;
   for (args.arguments.arguments_len = 0; arguments[args.arguments.arguments_len]; args.arguments.arguments_len++) ;
-  serial = dispatch (g, GUESTFS_PROC_COMMAND_LINES,
+  serial = guestfs_send (g, GUESTFS_PROC_COMMAND_LINES,
                      (xdrproc_t) xdr_guestfs_command_lines_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = command_lines_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, command_lines_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_command_lines failed, see earlier error messages");
     return NULL;
   }
@@ -4045,19 +3558,20 @@ char **guestfs_command_lines (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.lines.lines_val =    safe_realloc (g, state.ret.lines.lines_val,
+  state.ret.lines.lines_val =
+    safe_realloc (g, state.ret.lines.lines_val,
                   sizeof (char *) * (state.ret.lines.lines_len + 1));
   state.ret.lines.lines_val[state.ret.lines.lines_len] = NULL;
   return state.ret.lines.lines_val;
 }
 
 struct stat_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_stat_ret ret;
@@ -4065,6 +3579,7 @@ struct stat_state {
 
 static void stat_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct stat_state *state = (struct stat_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4083,8 +3598,8 @@ static void stat_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 struct guestfs_stat *guestfs_stat (guestfs_h *g,
@@ -4092,36 +3607,24 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g,
 {
   struct guestfs_stat_args args;
   struct stat_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_stat");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_stat");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_stat", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_stat") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_STAT,
+  serial = guestfs_send (g, GUESTFS_PROC_STAT,
                      (xdrproc_t) xdr_guestfs_stat_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = stat_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, stat_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_stat failed, see earlier error messages");
     return NULL;
   }
@@ -4130,7 +3633,7 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -4139,7 +3642,7 @@ struct guestfs_stat *guestfs_stat (guestfs_h *g,
 }
 
 struct lstat_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_lstat_ret ret;
@@ -4147,6 +3650,7 @@ struct lstat_state {
 
 static void lstat_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct lstat_state *state = (struct lstat_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4165,8 +3669,8 @@ static void lstat_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 struct guestfs_stat *guestfs_lstat (guestfs_h *g,
@@ -4174,36 +3678,24 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g,
 {
   struct guestfs_lstat_args args;
   struct lstat_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_lstat");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_lstat");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_lstat", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_lstat") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_LSTAT,
+  serial = guestfs_send (g, GUESTFS_PROC_LSTAT,
                      (xdrproc_t) xdr_guestfs_lstat_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = lstat_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, lstat_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_lstat failed, see earlier error messages");
     return NULL;
   }
@@ -4212,7 +3704,7 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -4221,7 +3713,7 @@ struct guestfs_stat *guestfs_lstat (guestfs_h *g,
 }
 
 struct statvfs_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_statvfs_ret ret;
@@ -4229,6 +3721,7 @@ struct statvfs_state {
 
 static void statvfs_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct statvfs_state *state = (struct statvfs_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4247,8 +3740,8 @@ static void statvfs_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
@@ -4256,36 +3749,24 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
 {
   struct guestfs_statvfs_args args;
   struct statvfs_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_statvfs");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_statvfs");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_statvfs", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_statvfs") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.path = (char *) path;
-  serial = dispatch (g, GUESTFS_PROC_STATVFS,
+  serial = guestfs_send (g, GUESTFS_PROC_STATVFS,
                      (xdrproc_t) xdr_guestfs_statvfs_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = statvfs_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, statvfs_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_statvfs failed, see earlier error messages");
     return NULL;
   }
@@ -4294,7 +3775,7 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
@@ -4303,7 +3784,7 @@ struct guestfs_statvfs *guestfs_statvfs (guestfs_h *g,
 }
 
 struct tune2fs_l_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_tune2fs_l_ret ret;
@@ -4311,6 +3792,7 @@ struct tune2fs_l_state {
 
 static void tune2fs_l_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct tune2fs_l_state *state = (struct tune2fs_l_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4329,8 +3811,8 @@ static void tune2fs_l_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 char **guestfs_tune2fs_l (guestfs_h *g,
@@ -4338,36 +3820,24 @@ char **guestfs_tune2fs_l (guestfs_h *g,
 {
   struct guestfs_tune2fs_l_args args;
   struct tune2fs_l_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_tune2fs_l");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_tune2fs_l");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_tune2fs_l", g->state);
-    return NULL;
-  }
+  if (check_state (g, "guestfs_tune2fs_l") == -1) return NULL;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_TUNE2FS_L,
+  serial = guestfs_send (g, GUESTFS_PROC_TUNE2FS_L,
                      (xdrproc_t) xdr_guestfs_tune2fs_l_args, (char *) &args);
   if (serial == -1)
     return NULL;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = tune2fs_l_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, tune2fs_l_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_tune2fs_l failed, see earlier error messages");
     return NULL;
   }
@@ -4376,25 +3846,27 @@ char **guestfs_tune2fs_l (guestfs_h *g,
     return NULL;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return NULL;
   }
 
   /* caller will free this, but we need to add a NULL entry */
-  state.ret.superblock.superblock_val =    safe_realloc (g, state.ret.superblock.superblock_val,
+  state.ret.superblock.superblock_val =
+    safe_realloc (g, state.ret.superblock.superblock_val,
                   sizeof (char *) * (state.ret.superblock.superblock_len + 1));
   state.ret.superblock.superblock_val[state.ret.superblock.superblock_len] = NULL;
   return state.ret.superblock.superblock_val;
 }
 
 struct blockdev_setro_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void blockdev_setro_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_setro_state *state = (struct blockdev_setro_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4409,8 +3881,8 @@ static void blockdev_setro_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_setro (guestfs_h *g,
@@ -4418,36 +3890,24 @@ int guestfs_blockdev_setro (guestfs_h *g,
 {
   struct guestfs_blockdev_setro_args args;
   struct blockdev_setro_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_setro");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_setro");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_setro", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_setro") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_SETRO,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_SETRO,
                      (xdrproc_t) xdr_guestfs_blockdev_setro_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_setro_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_setro_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_setro failed, see earlier error messages");
     return -1;
   }
@@ -4456,7 +3916,7 @@ int guestfs_blockdev_setro (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -4464,13 +3924,14 @@ int guestfs_blockdev_setro (guestfs_h *g,
 }
 
 struct blockdev_setrw_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void blockdev_setrw_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_setrw_state *state = (struct blockdev_setrw_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4485,8 +3946,8 @@ static void blockdev_setrw_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_setrw (guestfs_h *g,
@@ -4494,36 +3955,24 @@ int guestfs_blockdev_setrw (guestfs_h *g,
 {
   struct guestfs_blockdev_setrw_args args;
   struct blockdev_setrw_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_setrw");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_setrw");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_setrw", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_setrw") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_SETRW,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_SETRW,
                      (xdrproc_t) xdr_guestfs_blockdev_setrw_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_setrw_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_setrw_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_setrw failed, see earlier error messages");
     return -1;
   }
@@ -4532,7 +3981,7 @@ int guestfs_blockdev_setrw (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -4540,7 +3989,7 @@ int guestfs_blockdev_setrw (guestfs_h *g,
 }
 
 struct blockdev_getro_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_blockdev_getro_ret ret;
@@ -4548,6 +3997,7 @@ struct blockdev_getro_state {
 
 static void blockdev_getro_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getro_state *state = (struct blockdev_getro_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4566,8 +4016,8 @@ static void blockdev_getro_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_getro (guestfs_h *g,
@@ -4575,36 +4025,24 @@ int guestfs_blockdev_getro (guestfs_h *g,
 {
   struct guestfs_blockdev_getro_args args;
   struct blockdev_getro_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_getro");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_getro");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_getro", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_getro") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_GETRO,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_GETRO,
                      (xdrproc_t) xdr_guestfs_blockdev_getro_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_getro_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_getro_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_getro failed, see earlier error messages");
     return -1;
   }
@@ -4613,7 +4051,7 @@ int guestfs_blockdev_getro (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -4621,7 +4059,7 @@ int guestfs_blockdev_getro (guestfs_h *g,
 }
 
 struct blockdev_getss_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_blockdev_getss_ret ret;
@@ -4629,6 +4067,7 @@ struct blockdev_getss_state {
 
 static void blockdev_getss_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getss_state *state = (struct blockdev_getss_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4647,8 +4086,8 @@ static void blockdev_getss_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_getss (guestfs_h *g,
@@ -4656,36 +4095,24 @@ int guestfs_blockdev_getss (guestfs_h *g,
 {
   struct guestfs_blockdev_getss_args args;
   struct blockdev_getss_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_getss");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_getss");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_getss", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_getss") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_GETSS,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_GETSS,
                      (xdrproc_t) xdr_guestfs_blockdev_getss_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_getss_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_getss_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_getss failed, see earlier error messages");
     return -1;
   }
@@ -4694,7 +4121,7 @@ int guestfs_blockdev_getss (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -4702,7 +4129,7 @@ int guestfs_blockdev_getss (guestfs_h *g,
 }
 
 struct blockdev_getbsz_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_blockdev_getbsz_ret ret;
@@ -4710,6 +4137,7 @@ struct blockdev_getbsz_state {
 
 static void blockdev_getbsz_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getbsz_state *state = (struct blockdev_getbsz_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4728,8 +4156,8 @@ static void blockdev_getbsz_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_getbsz (guestfs_h *g,
@@ -4737,36 +4165,24 @@ int guestfs_blockdev_getbsz (guestfs_h *g,
 {
   struct guestfs_blockdev_getbsz_args args;
   struct blockdev_getbsz_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_getbsz");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_getbsz");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_getbsz", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_getbsz") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_GETBSZ,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_GETBSZ,
                      (xdrproc_t) xdr_guestfs_blockdev_getbsz_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_getbsz_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_getbsz_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_getbsz failed, see earlier error messages");
     return -1;
   }
@@ -4775,7 +4191,7 @@ int guestfs_blockdev_getbsz (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -4783,13 +4199,14 @@ int guestfs_blockdev_getbsz (guestfs_h *g,
 }
 
 struct blockdev_setbsz_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void blockdev_setbsz_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_setbsz_state *state = (struct blockdev_setbsz_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4804,8 +4221,8 @@ static void blockdev_setbsz_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_setbsz (guestfs_h *g,
@@ -4814,37 +4231,25 @@ int guestfs_blockdev_setbsz (guestfs_h *g,
 {
   struct guestfs_blockdev_setbsz_args args;
   struct blockdev_setbsz_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_setbsz");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_setbsz");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_setbsz", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_setbsz") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
   args.blocksize = blocksize;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_SETBSZ,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_SETBSZ,
                      (xdrproc_t) xdr_guestfs_blockdev_setbsz_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_setbsz_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_setbsz_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_setbsz failed, see earlier error messages");
     return -1;
   }
@@ -4853,7 +4258,7 @@ int guestfs_blockdev_setbsz (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -4861,7 +4266,7 @@ int guestfs_blockdev_setbsz (guestfs_h *g,
 }
 
 struct blockdev_getsz_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_blockdev_getsz_ret ret;
@@ -4869,6 +4274,7 @@ struct blockdev_getsz_state {
 
 static void blockdev_getsz_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getsz_state *state = (struct blockdev_getsz_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4887,8 +4293,8 @@ static void blockdev_getsz_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int64_t guestfs_blockdev_getsz (guestfs_h *g,
@@ -4896,36 +4302,24 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g,
 {
   struct guestfs_blockdev_getsz_args args;
   struct blockdev_getsz_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_getsz");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_getsz");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_getsz", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_getsz") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_GETSZ,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_GETSZ,
                      (xdrproc_t) xdr_guestfs_blockdev_getsz_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_getsz_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_getsz_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_getsz failed, see earlier error messages");
     return -1;
   }
@@ -4934,7 +4328,7 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -4942,7 +4336,7 @@ int64_t guestfs_blockdev_getsz (guestfs_h *g,
 }
 
 struct blockdev_getsize64_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
   struct guestfs_blockdev_getsize64_ret ret;
@@ -4950,6 +4344,7 @@ struct blockdev_getsize64_state {
 
 static void blockdev_getsize64_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_getsize64_state *state = (struct blockdev_getsize64_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -4968,8 +4363,8 @@ static void blockdev_getsize64_cb (guestfs_h *g, void *data, XDR *xdr)
     return;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
@@ -4977,36 +4372,24 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
 {
   struct guestfs_blockdev_getsize64_args args;
   struct blockdev_getsize64_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_getsize64");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_getsize64");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_getsize64", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_getsize64") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_GETSIZE64,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_GETSIZE64,
                      (xdrproc_t) xdr_guestfs_blockdev_getsize64_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_getsize64_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_getsize64_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_getsize64 failed, see earlier error messages");
     return -1;
   }
@@ -5015,7 +4398,7 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -5023,13 +4406,14 @@ int64_t guestfs_blockdev_getsize64 (guestfs_h *g,
 }
 
 struct blockdev_flushbufs_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void blockdev_flushbufs_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_flushbufs_state *state = (struct blockdev_flushbufs_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -5044,8 +4428,8 @@ static void blockdev_flushbufs_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_flushbufs (guestfs_h *g,
@@ -5053,36 +4437,24 @@ int guestfs_blockdev_flushbufs (guestfs_h *g,
 {
   struct guestfs_blockdev_flushbufs_args args;
   struct blockdev_flushbufs_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_flushbufs");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_flushbufs");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_flushbufs", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_flushbufs") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_FLUSHBUFS,
                      (xdrproc_t) xdr_guestfs_blockdev_flushbufs_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_flushbufs_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_flushbufs_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_flushbufs failed, see earlier error messages");
     return -1;
   }
@@ -5091,7 +4463,7 @@ int guestfs_blockdev_flushbufs (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
@@ -5099,13 +4471,14 @@ int guestfs_blockdev_flushbufs (guestfs_h *g,
 }
 
 struct blockdev_rereadpt_state {
-  int cb_done;
+  int cb_state;
   struct guestfs_message_header hdr;
   struct guestfs_message_error err;
 };
 
 static void blockdev_rereadpt_cb (guestfs_h *g, void *data, XDR *xdr)
 {
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   struct blockdev_rereadpt_state *state = (struct blockdev_rereadpt_state *) data;
 
   if (!xdr_guestfs_message_header (xdr, &state->hdr)) {
@@ -5120,8 +4493,8 @@ static void blockdev_rereadpt_cb (guestfs_h *g, void *data, XDR *xdr)
     goto done;
   }
  done:
-  state->cb_done = 1;
-  g->main_loop->main_loop_quit (g->main_loop, g);
+  state->cb_state = 1;
+  ml->main_loop_quit (ml, g);
 }
 
 int guestfs_blockdev_rereadpt (guestfs_h *g,
@@ -5129,36 +4502,24 @@ int guestfs_blockdev_rereadpt (guestfs_h *g,
 {
   struct guestfs_blockdev_rereadpt_args args;
   struct blockdev_rereadpt_state state;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
   int serial;
 
-  if (g->state != READY) {
-    if (g->state == CONFIG)
-      error (g, "%s: call launch() before using this function",
-        "guestfs_blockdev_rereadpt");
-    else if (g->state == LAUNCHING)
-      error (g, "%s: call wait_ready() before using this function",
-        "guestfs_blockdev_rereadpt");
-    else
-      error (g, "%s called from the wrong state, %d != READY",
-        "guestfs_blockdev_rereadpt", g->state);
-    return -1;
-  }
+  if (check_state (g, "guestfs_blockdev_rereadpt") == -1) return -1;
 
   memset (&state, 0, sizeof state);
 
   args.device = (char *) device;
-  serial = dispatch (g, GUESTFS_PROC_BLOCKDEV_REREADPT,
+  serial = guestfs_send (g, GUESTFS_PROC_BLOCKDEV_REREADPT,
                      (xdrproc_t) xdr_guestfs_blockdev_rereadpt_args, (char *) &args);
   if (serial == -1)
     return -1;
 
-  state.cb_done = 0;
-  g->reply_cb_internal = blockdev_rereadpt_cb;
-  g->reply_cb_internal_data = &state;
-  (void) g->main_loop->main_loop_run (g->main_loop, g);
-  g->reply_cb_internal = NULL;
-  g->reply_cb_internal_data = NULL;
-  if (!state.cb_done) {
+  state.cb_state = 0;
+  guestfs_set_reply_callback (g, blockdev_rereadpt_cb, &state);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (!state.cb_state) {
     error (g, "guestfs_blockdev_rereadpt failed, see earlier error messages");
     return -1;
   }
@@ -5167,7 +4528,7 @@ int guestfs_blockdev_rereadpt (guestfs_h *g,
     return -1;
 
   if (state.hdr.status == GUESTFS_STATUS_ERROR) {
-    error (g, "%s", state.err.error);
+    error (g, "%s", state.err.error_message);
     return -1;
   }
 
diff --git a/src/guestfs-actions.h b/src/guestfs-actions.h
index 14ca54fc..9ad13f6a 100644
--- a/src/guestfs-actions.h
+++ b/src/guestfs-actions.h
@@ -31,6 +31,11 @@ extern int guestfs_set_autosync (guestfs_h *handle, int autosync);
 extern int guestfs_get_autosync (guestfs_h *handle);
 extern int guestfs_set_verbose (guestfs_h *handle, int verbose);
 extern int guestfs_get_verbose (guestfs_h *handle);
+extern int guestfs_is_ready (guestfs_h *handle);
+extern int guestfs_is_config (guestfs_h *handle);
+extern int guestfs_is_launching (guestfs_h *handle);
+extern int guestfs_is_busy (guestfs_h *handle);
+extern int guestfs_get_state (guestfs_h *handle);
 extern int guestfs_mount (guestfs_h *handle, const char *device, const char *mountpoint);
 extern int guestfs_sync (guestfs_h *handle);
 extern int guestfs_touch (guestfs_h *handle, const char *path);
diff --git a/src/guestfs.c b/src/guestfs.c
index 6c49e909..cc33e670 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -56,12 +56,19 @@
 #include "guestfs.h"
 #include "guestfs_protocol.h"
 
-static void error (guestfs_h *g, const char *fs, ...);
-static void perrorf (guestfs_h *g, const char *fs, ...);
-static void *safe_malloc (guestfs_h *g, size_t nbytes);
-static void *safe_realloc (guestfs_h *g, void *ptr, int nbytes);
-static char *safe_strdup (guestfs_h *g, const char *str);
-static void *safe_memdup (guestfs_h *g, void *ptr, size_t size);
+void guestfs_error (guestfs_h *g, const char *fs, ...);
+void guestfs_perrorf (guestfs_h *g, const char *fs, ...);
+void *guestfs_safe_malloc (guestfs_h *g, size_t nbytes);
+void *guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes);
+char *guestfs_safe_strdup (guestfs_h *g, const char *str);
+void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size);
+
+#define error guestfs_error
+#define perrorf guestfs_perrorf
+#define safe_malloc guestfs_safe_malloc
+#define safe_realloc guestfs_safe_realloc
+#define safe_strdup guestfs_safe_strdup
+#define safe_memdup guestfs_safe_memdup
 
 static void default_error_cb (guestfs_h *g, void *data, const char *msg);
 static void stdout_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data, int watch, int fd, int events);
@@ -174,18 +181,6 @@ struct guestfs_h
   guestfs_launch_done_cb     launch_done_cb;
   void *                     launch_done_cb_data;
 
-  /* These callbacks are called before send_cb, reply_cb and
-   * launch_done_cb, and are used to implement the high-level
-   * API without needing to interfere with callbacks that the
-   * user might have set.
-   */
-  guestfs_send_cb            send_cb_internal;
-  void *                     send_cb_internal_data;
-  guestfs_reply_cb           reply_cb_internal;
-  void *                     reply_cb_internal_data;
-  guestfs_launch_done_cb     launch_done_cb_internal;
-  void *                     launch_done_cb_internal_data;
-
   /* Main loop used by this handle. */
   guestfs_main_loop *main_loop;
 
@@ -231,7 +226,7 @@ guestfs_create (void)
   g->path = str != NULL ? str : GUESTFS_DEFAULT_PATH;
   /* XXX We should probably make QEMU configurable as well. */
 
-  g->main_loop = (guestfs_main_loop *) &default_main_loop;
+  g->main_loop = guestfs_get_default_main_loop ();
 
   /* Start with large serial numbers so they are easy to spot
    * inside the protocol.
@@ -342,8 +337,8 @@ default_error_cb (guestfs_h *g, void *data, const char *msg)
   fprintf (stderr, "libguestfs: error: %s\n", msg);
 }
 
-static void
-error (guestfs_h *g, const char *fs, ...)
+void
+guestfs_error (guestfs_h *g, const char *fs, ...)
 {
   va_list args;
   char *msg;
@@ -358,8 +353,8 @@ error (guestfs_h *g, const char *fs, ...)
   free (msg);
 }
 
-static void
-perrorf (guestfs_h *g, const char *fs, ...)
+void
+guestfs_perrorf (guestfs_h *g, const char *fs, ...)
 {
   va_list args;
   char *msg;
@@ -388,32 +383,32 @@ perrorf (guestfs_h *g, const char *fs, ...)
   free (msg);
 }
 
-static void *
-safe_malloc (guestfs_h *g, size_t nbytes)
+void *
+guestfs_safe_malloc (guestfs_h *g, size_t nbytes)
 {
   void *ptr = malloc (nbytes);
   if (!ptr) g->abort_cb ();
   return ptr;
 }
 
-static void *
-safe_realloc (guestfs_h *g, void *ptr, int nbytes)
+void *
+guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes)
 {
   void *p = realloc (ptr, nbytes);
   if (!p) g->abort_cb ();
   return p;
 }
 
-static char *
-safe_strdup (guestfs_h *g, const char *str)
+char *
+guestfs_safe_strdup (guestfs_h *g, const char *str)
 {
   char *s = strdup (str);
   if (!s) g->abort_cb ();
   return s;
 }
 
-static void *
-safe_memdup (guestfs_h *g, void *ptr, size_t size)
+void *
+guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size)
 {
   void *p = malloc (size);
   if (!p) g->abort_cb ();
@@ -901,11 +896,11 @@ guestfs_wait_ready (guestfs_h *g)
     return -1;
   }
 
-  g->launch_done_cb_internal = finish_wait_ready;
-  g->launch_done_cb_internal_data = &finished;
+  g->launch_done_cb = finish_wait_ready;
+  g->launch_done_cb_data = &finished;
   r = g->main_loop->main_loop_run (g->main_loop, g);
-  g->launch_done_cb_internal = NULL;
-  g->launch_done_cb_internal_data = NULL;
+  g->launch_done_cb = NULL;
+  g->launch_done_cb_data = NULL;
 
   if (r == -1) return -1;
 
@@ -943,6 +938,68 @@ guestfs_kill_subprocess (guestfs_h *g)
   return 0;
 }
 
+/* Access current state. */
+int
+guestfs_is_config (guestfs_h *g)
+{
+  return g->state == CONFIG;
+}
+
+int
+guestfs_is_launching (guestfs_h *g)
+{
+  return g->state == LAUNCHING;
+}
+
+int
+guestfs_is_ready (guestfs_h *g)
+{
+  return g->state == READY;
+}
+
+int
+guestfs_is_busy (guestfs_h *g)
+{
+  return g->state == BUSY;
+}
+
+int
+guestfs_get_state (guestfs_h *g)
+{
+  return g->state;
+}
+
+/* Structure-freeing functions.  These rely on the fact that the
+ * structure format is identical to the XDR format.  See note in
+ * generator.ml.
+ */
+void
+guestfs_free_int_bool (struct guestfs_int_bool *x)
+{
+  free (x);
+}
+
+void
+guestfs_free_lvm_pv_list (struct guestfs_lvm_pv_list *x)
+{
+  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_pv_list, (char *) x);
+  free (x);
+}
+
+void
+guestfs_free_lvm_vg_list (struct guestfs_lvm_vg_list *x)
+{
+  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_vg_list, (char *) x);
+  free (x);
+}
+
+void
+guestfs_free_lvm_lv_list (struct guestfs_lvm_lv_list *x)
+{
+  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_lv_list, (char *) x);
+  free (x);
+}
+
 /* This function is called whenever qemu prints something on stdout.
  * Qemu's stdout is also connected to the guest's serial console, so
  * we see kernel messages here too.
@@ -1071,8 +1128,6 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
 	     g->msg_in_size);
     else {
       g->state = READY;
-      if (g->launch_done_cb_internal)
-	g->launch_done_cb_internal (g, g->launch_done_cb_internal_data);
       if (g->launch_done_cb)
 	g->launch_done_cb (g, g->launch_done_cb_data);
     }
@@ -1123,15 +1178,10 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
   if (g->state != BUSY)
     error (g, "state %d != BUSY", g->state);
 
-  /* Push the message up to the higher layer.  Note that unlike
-   * launch_done_cb / launch_done_cb_internal, we only call at
-   * most one of the callback functions here.
-   */
+  /* Push the message up to the higher layer. */
   g->state = READY;
-  if (g->reply_cb_internal)
-    g->reply_cb_internal (g, g->reply_cb_internal_data, &xdr);
-  else if (g->reply_cb)
-    g->reply_cb (g, g->reply_cb, &xdr);
+  if (g->reply_cb)
+    g->reply_cb (g, g->reply_cb_data, &xdr);
 
  cleanup:
   /* Free the message buffer if it's grown excessively large. */
@@ -1210,12 +1260,72 @@ sock_write_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
   }
 }
 
-/* Dispatch a call to the remote daemon.  This function just queues
- * the call in msg_out, to be sent when we next enter the main loop.
- * Returns -1 for error, or the message serial number.
+void
+guestfs_set_send_callback (guestfs_h *g,
+			   guestfs_send_cb cb, void *opaque)
+{
+  g->send_cb = cb;
+  g->send_cb_data = opaque;
+}
+
+void
+guestfs_set_reply_callback (guestfs_h *g,
+			    guestfs_reply_cb cb, void *opaque)
+{
+  g->reply_cb = cb;
+  g->reply_cb_data = opaque;
+}
+
+void
+guestfs_set_log_message_callback (guestfs_h *g,
+				  guestfs_log_message_cb cb, void *opaque)
+{
+  g->log_message_cb = cb;
+  g->log_message_cb_data = opaque;
+}
+
+void
+guestfs_set_subprocess_quit_callback (guestfs_h *g,
+				      guestfs_subprocess_quit_cb cb, void *opaque)
+{
+  g->subprocess_quit_cb = cb;
+  g->subprocess_quit_cb_data = opaque;
+}
+
+void
+guestfs_set_launch_done_callback (guestfs_h *g,
+				  guestfs_launch_done_cb cb, void *opaque)
+{
+  g->launch_done_cb = cb;
+  g->launch_done_cb_data = opaque;
+}
+
+/* Access to the handle's main loop and the default main loop. */
+void
+guestfs_set_main_loop (guestfs_h *g, guestfs_main_loop *main_loop)
+{
+  g->main_loop = main_loop;
+}
+
+guestfs_main_loop *
+guestfs_get_main_loop (guestfs_h *g)
+{
+  return g->main_loop;
+}
+
+guestfs_main_loop *
+guestfs_get_default_main_loop (void)
+{
+  return (guestfs_main_loop *) &default_main_loop;
+}
+
+/* Dispatch a call (len + header + args) to the remote daemon.  This
+ * function just queues the call in msg_out, to be sent when we next
+ * enter the main loop.  Returns -1 for error, or the message serial
+ * number.
  */
-static int
-dispatch (guestfs_h *g, int proc_nr, xdrproc_t xdrp, char *args)
+int
+guestfs_send (guestfs_h *g, int proc_nr, xdrproc_t xdrp, char *args)
 {
   char buffer[GUESTFS_MESSAGE_MAX];
   struct guestfs_message_header hdr;
@@ -1427,74 +1537,6 @@ send_file_complete (guestfs_h *g)
 }
 #endif
 
-/* Check the return message from a call for validity. */
-static int
-check_reply_header (guestfs_h *g,
-		    const struct guestfs_message_header *hdr,
-		    int proc_nr, int serial)
-{
-  if (hdr->prog != GUESTFS_PROGRAM) {
-    error (g, "wrong program (%d/%d)", hdr->prog, GUESTFS_PROGRAM);
-    return -1;
-  }
-  if (hdr->vers != GUESTFS_PROTOCOL_VERSION) {
-    error (g, "wrong protocol version (%d/%d)",
-	   hdr->vers, GUESTFS_PROTOCOL_VERSION);
-    return -1;
-  }
-  if (hdr->direction != GUESTFS_DIRECTION_REPLY) {
-    error (g, "unexpected message direction (%d/%d)",
-	   hdr->direction, GUESTFS_DIRECTION_REPLY);
-    return -1;
-  }
-  if (hdr->proc != proc_nr) {
-    error (g, "unexpected procedure number (%d/%d)", hdr->proc, proc_nr);
-    return -1;
-  }
-  if (hdr->serial != serial) {
-    error (g, "unexpected serial (%d/%d)", hdr->serial, serial);
-    return -1;
-  }
-
-  return 0;
-}
-
-/* The high-level actions are autogenerated by generator.ml.  Include
- * them here.
- */
-#include "guestfs-actions.c"
-
-/* Structure-freeing functions.  These rely on the fact that the
- * structure format is identical to the XDR format.  See note in
- * generator.ml.
- */
-void
-guestfs_free_int_bool (struct guestfs_int_bool *x)
-{
-  free (x);
-}
-
-void
-guestfs_free_lvm_pv_list (struct guestfs_lvm_pv_list *x)
-{
-  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_pv_list, (char *) x);
-  free (x);
-}
-
-void
-guestfs_free_lvm_vg_list (struct guestfs_lvm_vg_list *x)
-{
-  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_vg_list, (char *) x);
-  free (x);
-}
-
-void
-guestfs_free_lvm_lv_list (struct guestfs_lvm_lv_list *x)
-{
-  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_lv_list, (char *) x);
-  free (x);
-}
-
 /* This is the default main loop implementation, using select(2). */
 
 static int
diff --git a/src/guestfs.h b/src/guestfs.h
index bfa6b9ca..ea76a183 100644
--- a/src/guestfs.h
+++ b/src/guestfs.h
@@ -47,6 +47,7 @@ extern guestfs_abort_cb guestfs_get_out_of_memory_handler (guestfs_h *g);
 #include <guestfs-structs.h>
 #include <guestfs-actions.h>
 
+/* Free up return values. */
 extern void guestfs_free_int_bool (struct guestfs_int_bool *);
 extern void guestfs_free_lvm_pv_list (struct guestfs_lvm_pv_list *);
 extern void guestfs_free_lvm_vg_list (struct guestfs_lvm_vg_list *);
@@ -65,6 +66,15 @@ extern void guestfs_set_log_message_callback (guestfs_h *g, guestfs_log_message_
 extern void guestfs_set_subprocess_quit_callback (guestfs_h *g, guestfs_subprocess_quit_cb cb, void *opaque);
 extern void guestfs_set_launch_done_callback (guestfs_h *g, guestfs_launch_done_cb cb, void *opaque);
 
+extern void guestfs_error (guestfs_h *g, const char *fs, ...);
+extern void guestfs_perrorf (guestfs_h *g, const char *fs, ...);
+extern void *guestfs_safe_malloc (guestfs_h *g, size_t nbytes);
+extern void *guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes);
+extern char *guestfs_safe_strdup (guestfs_h *g, const char *str);
+extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size);
+
+extern int guestfs_send (guestfs_h *g, int proc_nr, xdrproc_t xdrp, char *args);
+
 /* Main loop. */
 #define GUESTFS_HANDLE_READABLE 0x1
 #define GUESTFS_HANDLE_WRITABLE 0x2
diff --git a/src/guestfs_protocol.c b/src/guestfs_protocol.c
index 86a338f4..c4246d60 100644
--- a/src/guestfs_protocol.c
+++ b/src/guestfs_protocol.c
@@ -1221,7 +1221,7 @@ xdr_guestfs_message_error (XDR *xdrs, guestfs_message_error *objp)
 {
 	register int32_t *buf;
 
-	 if (!xdr_string (xdrs, &objp->error, GUESTFS_ERROR_LEN))
+	 if (!xdr_string (xdrs, &objp->error_message, GUESTFS_ERROR_LEN))
 		 return FALSE;
 	return TRUE;
 }
diff --git a/src/guestfs_protocol.h b/src/guestfs_protocol.h
index c1837f8d..c863c859 100644
--- a/src/guestfs_protocol.h
+++ b/src/guestfs_protocol.h
@@ -703,7 +703,7 @@ typedef enum guestfs_message_status guestfs_message_status;
 #define GUESTFS_ERROR_LEN 256
 
 struct guestfs_message_error {
-	char *error;
+	char *error_message;
 };
 typedef struct guestfs_message_error guestfs_message_error;
 
diff --git a/src/guestfs_protocol.x b/src/guestfs_protocol.x
index d77bb5fe..d68a60a5 100644
--- a/src/guestfs_protocol.x
+++ b/src/guestfs_protocol.x
@@ -562,7 +562,7 @@ enum guestfs_message_status {
 const GUESTFS_ERROR_LEN = 256;
 
 struct guestfs_message_error {
-  string error<GUESTFS_ERROR_LEN>;   /* error message */
+  string error_message<GUESTFS_ERROR_LEN>;
 };
 
 /* For normal requests and replies (not involving any FileIn or
diff --git a/tests.c b/tests.c
index 5f05e6ba..7feee5c2 100644
--- a/tests.c
+++ b/tests.c
@@ -69,6 +69,11 @@ static void no_test_warnings (void)
   fprintf (stderr, "warning: \"guestfs_get_autosync\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_set_verbose\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_get_verbose\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_ready\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_config\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_launching\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_busy\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_state\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_ll\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_pvs_full\" has no tests\n");
   fprintf (stderr, "warning: \"guestfs_vgs_full\" has no tests\n");