X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs.c;h=02b3ceb35c30ff0587fafa9fae4b4358b1557664;hp=6c49e9091887e6da643079be0fb556cb265040aa;hb=675411d34f807420d1b714436fc5a58fc0022dae;hpb=1765330e07a48dc6f7bdef7007f69ebe606fa731

diff --git a/src/guestfs.c b/src/guestfs.c
index 6c49e90..02b3ceb 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -29,7 +29,10 @@
 #include <string.h>
 #include <fcntl.h>
 #include <time.h>
+#include <sys/stat.h>
 #include <sys/select.h>
+#include <dirent.h>
+
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
@@ -56,12 +59,21 @@
 #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);
+#ifdef HAVE_GETTEXT
+#include "gettext.h"
+#define _(str) dgettext(PACKAGE, (str))
+#define N_(str) dgettext(PACKAGE, (str))
+#else
+#define _(str) str
+#define N_(str) str
+#endif
+
+#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);
@@ -141,7 +153,8 @@ struct guestfs_h
 
   int fd[2];			/* Stdin/stdout of qemu. */
   int sock;			/* Daemon communications socket. */
-  int pid;			/* Qemu PID. */
+  pid_t pid;			/* Qemu PID. */
+  pid_t recoverypid;		/* Recovery process PID. */
   time_t start_t;		/* The time when we started qemu. */
 
   int stdout_watch;		/* Watches qemu stdout for log messages. */
@@ -149,13 +162,17 @@ struct guestfs_h
 
   char *tmpdir;			/* Temporary directory containing socket. */
 
+  char *qemu_help, *qemu_version; /* Output of qemu -help, qemu -version. */
+
   char **cmdline;		/* Qemu command line. */
   int cmdline_size;
 
   int verbose;
   int autosync;
 
-  const char *path;
+  char *path;			/* Path to kernel, initrd. */
+  char *qemu;			/* Qemu binary. */
+  char *append;			/* Append to kernel command line. */
 
   char *last_error;
 
@@ -174,18 +191,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;
 
@@ -228,10 +233,20 @@ guestfs_create (void)
   g->verbose = str != NULL && strcmp (str, "1") == 0;
 
   str = getenv ("LIBGUESTFS_PATH");
-  g->path = str != NULL ? str : GUESTFS_DEFAULT_PATH;
-  /* XXX We should probably make QEMU configurable as well. */
+  g->path = str != NULL ? strdup (str) : strdup (GUESTFS_DEFAULT_PATH);
+  if (!g->path) goto error;
+
+  str = getenv ("LIBGUESTFS_QEMU");
+  g->qemu = str != NULL ? strdup (str) : strdup (QEMU);
+  if (!g->qemu) goto error;
 
-  g->main_loop = (guestfs_main_loop *) &default_main_loop;
+  str = getenv ("LIBGUESTFS_APPEND");
+  if (str) {
+    g->append = strdup (str);
+    if (!g->append) goto error;
+  }
+
+  g->main_loop = guestfs_get_default_main_loop ();
 
   /* Start with large serial numbers so they are easy to spot
    * inside the protocol.
@@ -254,6 +269,13 @@ guestfs_create (void)
     fprintf (stderr, "new guestfs handle %p\n", g);
 
   return g;
+
+ error:
+  free (g->path);
+  free (g->qemu);
+  free (g->append);
+  free (g);
+  return NULL;
 }
 
 void
@@ -265,7 +287,7 @@ guestfs_close (guestfs_h *g)
 
   if (g->state == NO_HANDLE) {
     /* Not safe to call 'error' here, so ... */
-    fprintf (stderr, "guestfs_close: called twice on the same handle\n");
+    fprintf (stderr, _("guestfs_close: called twice on the same handle\n"));
     return;
   }
 
@@ -273,8 +295,10 @@ guestfs_close (guestfs_h *g)
     fprintf (stderr, "closing guestfs handle %p (state %d)\n", g, g->state);
 
   /* Try to sync if autosync flag is set. */
-  if (g->autosync && g->state == READY)
+  if (g->autosync && g->state == READY) {
+    guestfs_umount_all (g);
     guestfs_sync (g);
+  }
 
   /* Remove any handlers that might be called back before we kill the
    * subprocess.
@@ -288,6 +312,12 @@ guestfs_close (guestfs_h *g)
     snprintf (filename, sizeof filename, "%s/sock", g->tmpdir);
     unlink (filename);
 
+    snprintf (filename, sizeof filename, "%s/initrd", g->tmpdir);
+    unlink (filename);
+
+    snprintf (filename, sizeof filename, "%s/kernel", g->tmpdir);
+    unlink (filename);
+
     rmdir (g->tmpdir);
 
     free (g->tmpdir);
@@ -312,7 +342,14 @@ guestfs_close (guestfs_h *g)
   }
   /* release mutex (XXX) */
 
+  free (g->msg_in);
+  free (g->msg_out);
   free (g->last_error);
+  free (g->path);
+  free (g->qemu);
+  free (g->append);
+  free (g->qemu_help);
+  free (g->qemu_version);
   free (g);
 }
 
@@ -339,11 +376,11 @@ set_last_error (guestfs_h *g, const char *msg)
 static void
 default_error_cb (guestfs_h *g, void *data, const char *msg)
 {
-  fprintf (stderr, "libguestfs: error: %s\n", 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 +395,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 +425,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 ();
+  if (nbytes > 0 && !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 ();
+  if (nbytes > 0 && !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 ();
@@ -421,6 +458,43 @@ safe_memdup (guestfs_h *g, void *ptr, size_t size)
   return p;
 }
 
+static int
+xwrite (int fd, const void *buf, size_t len)
+{
+  int r;
+
+  while (len > 0) {
+    r = write (fd, buf, len);
+    if (r == -1)
+      return -1;
+
+    buf += r;
+    len -= r;
+  }
+
+  return 0;
+}
+
+static int
+xread (int fd, void *buf, size_t len)
+{
+  int r;
+
+  while (len > 0) {
+    r = read (fd, buf, len);
+    if (r == -1) {
+      if (errno == EINTR || errno == EAGAIN)
+	continue;
+      return -1;
+    }
+
+    buf += r;
+    len -= r;
+  }
+
+  return 0;
+}
+
 void
 guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb cb)
 {
@@ -476,10 +550,12 @@ guestfs_get_autosync (guestfs_h *g)
 int
 guestfs_set_path (guestfs_h *g, const char *path)
 {
-  if (path == NULL)
-    g->path = GUESTFS_DEFAULT_PATH;
-  else
-    g->path = path;
+  free (g->path);
+  g->path = NULL;
+
+  g->path =
+    path == NULL ?
+    safe_strdup (g, GUESTFS_DEFAULT_PATH) : safe_strdup (g, path);
   return 0;
 }
 
@@ -489,6 +565,38 @@ guestfs_get_path (guestfs_h *g)
   return g->path;
 }
 
+int
+guestfs_set_qemu (guestfs_h *g, const char *qemu)
+{
+  free (g->qemu);
+  g->qemu = NULL;
+
+  g->qemu = qemu == NULL ? safe_strdup (g, QEMU) : safe_strdup (g, qemu);
+  return 0;
+}
+
+const char *
+guestfs_get_qemu (guestfs_h *g)
+{
+  return g->qemu;
+}
+
+int
+guestfs_set_append (guestfs_h *g, const char *append)
+{
+  free (g->append);
+  g->append = NULL;
+
+  g->append = append ? safe_strdup (g, append) : NULL;
+  return 0;
+}
+
+const char *
+guestfs_get_append (guestfs_h *g)
+{
+  return g->append;
+}
+
 /* Add a string to the current command line. */
 static void
 incr_cmdline_size (guestfs_h *g)
@@ -508,7 +616,8 @@ static int
 add_cmdline (guestfs_h *g, const char *str)
 {
   if (g->state != CONFIG) {
-    error (g, "command line cannot be altered after qemu subprocess launched");
+    error (g,
+        _("command line cannot be altered after qemu subprocess launched"));
     return -1;
   }
 
@@ -522,7 +631,7 @@ guestfs_config (guestfs_h *g,
 		const char *qemu_param, const char *qemu_value)
 {
   if (qemu_param[0] != '-') {
-    error (g, "guestfs_config: parameter must begin with '-' character");
+    error (g, _("guestfs_config: parameter must begin with '-' character"));
     return -1;
   }
 
@@ -533,11 +642,10 @@ guestfs_config (guestfs_h *g,
       strcmp (qemu_param, "-initrd") == 0 ||
       strcmp (qemu_param, "-nographic") == 0 ||
       strcmp (qemu_param, "-serial") == 0 ||
-      strcmp (qemu_param, "-vnc") == 0 ||
       strcmp (qemu_param, "-full-screen") == 0 ||
       strcmp (qemu_param, "-std-vga") == 0 ||
       strcmp (qemu_param, "-vnc") == 0) {
-    error (g, "guestfs_config: parameter '%s' isn't allowed", qemu_param);
+    error (g, _("guestfs_config: parameter '%s' isn't allowed"), qemu_param);
     return -1;
   }
 
@@ -553,11 +661,33 @@ guestfs_config (guestfs_h *g,
 int
 guestfs_add_drive (guestfs_h *g, const char *filename)
 {
-  int len = strlen (filename) + 64;
+  size_t len = strlen (filename) + 64;
+  char buf[len];
+
+  if (strchr (filename, ',') != NULL) {
+    error (g, _("filename cannot contain ',' (comma) character"));
+    return -1;
+  }
+
+  if (access (filename, F_OK) == -1) {
+    perrorf (g, "%s", filename);
+    return -1;
+  }
+
+  /* cache=off improves reliability in the event of a host crash. */
+  snprintf (buf, len, "file=%s,cache=off", filename);
+
+  return guestfs_config (g, "-drive", buf);
+}
+
+int
+guestfs_add_drive_ro (guestfs_h *g, const char *filename)
+{
+  size_t len = strlen (filename) + 64;
   char buf[len];
 
   if (strchr (filename, ',') != NULL) {
-    error (g, "filename cannot contain ',' (comma) character");
+    error (g, _("filename cannot contain ',' (comma) character"));
     return -1;
   }
 
@@ -566,7 +696,7 @@ guestfs_add_drive (guestfs_h *g, const char *filename)
     return -1;
   }
 
-  snprintf (buf, len, "file=%s", filename);
+  snprintf (buf, len, "file=%s,snapshot=on", filename);
 
   return guestfs_config (g, "-drive", buf);
 }
@@ -575,7 +705,7 @@ int
 guestfs_add_cdrom (guestfs_h *g, const char *filename)
 {
   if (strchr (filename, ',') != NULL) {
-    error (g, "filename cannot contain ',' (comma) character");
+    error (g, _("filename cannot contain ',' (comma) character"));
     return -1;
   }
 
@@ -587,15 +717,56 @@ guestfs_add_cdrom (guestfs_h *g, const char *filename)
   return guestfs_config (g, "-cdrom", filename);
 }
 
+/* Returns true iff file is contained in dir. */
+static int
+dir_contains_file (const char *dir, const char *file)
+{
+  int dirlen = strlen (dir);
+  int filelen = strlen (file);
+  int len = dirlen+filelen+2;
+  char path[len];
+
+  snprintf (path, len, "%s/%s", dir, file);
+  return access (path, F_OK) == 0;
+}
+
+/* Returns true iff every listed file is contained in 'dir'. */
+static int
+dir_contains_files (const char *dir, ...)
+{
+  va_list args;
+  const char *file;
+
+  va_start (args, dir);
+  while ((file = va_arg (args, const char *)) != NULL) {
+    if (!dir_contains_file (dir, file)) {
+      va_end (args);
+      return 0;
+    }
+  }
+  va_end (args);
+  return 1;
+}
+
+static int build_supermin_appliance (guestfs_h *g, const char *path, char **kernel, char **initrd);
+static int test_qemu (guestfs_h *g);
+static int qemu_supports (guestfs_h *g, const char *option);
+
+static const char *kernel_name = "vmlinuz." REPO "." host_cpu;
+static const char *initrd_name = "initramfs." REPO "." host_cpu ".img";
+static const char *supermin_name =
+  "initramfs." REPO "." host_cpu ".supermin.img";
+static const char *supermin_hostfiles_name =
+  "initramfs." REPO "." host_cpu ".supermin.hostfiles";
+
 int
 guestfs_launch (guestfs_h *g)
 {
   static const char *dir_template = "/tmp/libguestfsXXXXXX";
-  int r, i, len, pmore;
+  int r, i, pmore, memsize;
+  size_t len;
   int wfd[2], rfd[2];
   int tries;
-  const char *kernel_name = "vmlinuz." REPO "." host_cpu;
-  const char *initrd_name = "initramfs." REPO "." host_cpu ".img";
   char *path, *pelem, *pend;
   char *kernel = NULL, *initrd = NULL;
   char unixsock[256];
@@ -603,16 +774,29 @@ guestfs_launch (guestfs_h *g)
 
   /* Configured? */
   if (!g->cmdline) {
-    error (g, "you must call guestfs_add_drive before guestfs_launch");
+    error (g, _("you must call guestfs_add_drive before guestfs_launch"));
     return -1;
   }
 
   if (g->state != CONFIG) {
-    error (g, "qemu has already been launched");
+    error (g, _("qemu has already been launched"));
     return -1;
   }
 
-  /* Search g->path for the kernel and initrd. */
+  /* Make the temporary directory. */
+  if (!g->tmpdir) {
+    g->tmpdir = safe_strdup (g, dir_template);
+    if (mkdtemp (g->tmpdir) == NULL) {
+      perrorf (g, _("%s: cannot create temporary directory"), dir_template);
+      goto cleanup0;
+    }
+  }
+
+  /* First search g->path for the supermin appliance, and try to
+   * synthesize a kernel and initrd from that.  If it fails, we
+   * try the path search again looking for a backup ordinary
+   * appliance.
+   */
   pelem = path = safe_strdup (g, g->path);
   do {
     pend = strchrnul (pelem, ':');
@@ -620,32 +804,31 @@ guestfs_launch (guestfs_h *g)
     *pend = '\0';
     len = pend - pelem;
 
-    /* Empty element or "." means cwd. */
+    /* Empty element of "." means cwd. */
     if (len == 0 || (len == 1 && *pelem == '.')) {
       if (g->verbose)
 	fprintf (stderr,
-		 "looking for kernel and initrd in current directory\n");
-      if (access (kernel_name, F_OK) == 0 && access (initrd_name, F_OK) == 0) {
-	kernel = safe_strdup (g, kernel_name);
-	initrd = safe_strdup (g, initrd_name);
+		 "looking for supermin appliance in current directory\n");
+      if (dir_contains_files (".",
+			      supermin_name, supermin_hostfiles_name,
+			      "kmod.whitelist", NULL)) {
+	if (build_supermin_appliance (g, ".", &kernel, &initrd) == -1)
+	  return -1;
 	break;
       }
     }
-    /* Look at <path>/kernel etc. */
+    /* Look at <path>/supermin* etc. */
     else {
-      kernel = safe_malloc (g, len + strlen (kernel_name) + 2);
-      initrd = safe_malloc (g, len + strlen (initrd_name) + 2);
-      sprintf (kernel, "%s/%s", pelem, kernel_name);
-      sprintf (initrd, "%s/%s", pelem, initrd_name);
-
       if (g->verbose)
-	fprintf (stderr, "looking for %s and %s\n", kernel, initrd);
+	fprintf (stderr, "looking for supermin appliance in %s\n", pelem);
 
-      if (access (kernel, F_OK) == 0 && access (initrd, F_OK) == 0)
+      if (dir_contains_files (pelem,
+			      supermin_name, supermin_hostfiles_name,
+			      "kmod.whitelist", NULL)) {
+	if (build_supermin_appliance (g, pelem, &kernel, &initrd) == -1)
+	  return -1;
 	break;
-      free (kernel);
-      free (initrd);
-      kernel = initrd = NULL;
+      }
     }
 
     pelem = pend + 1;
@@ -654,20 +837,65 @@ guestfs_launch (guestfs_h *g)
   free (path);
 
   if (kernel == NULL || initrd == NULL) {
-    error (g, "cannot find %s or %s on LIBGUESTFS_PATH (current path = %s)",
+    /* Search g->path for the kernel and initrd. */
+    pelem = path = safe_strdup (g, g->path);
+    do {
+      pend = strchrnul (pelem, ':');
+      pmore = *pend == ':';
+      *pend = '\0';
+      len = pend - pelem;
+
+      /* Empty element or "." means cwd. */
+      if (len == 0 || (len == 1 && *pelem == '.')) {
+	if (g->verbose)
+	  fprintf (stderr,
+		   "looking for appliance in current directory\n");
+	if (dir_contains_files (".", kernel_name, initrd_name, NULL)) {
+	  kernel = safe_strdup (g, kernel_name);
+	  initrd = safe_strdup (g, initrd_name);
+	  break;
+	}
+      }
+      /* Look at <path>/kernel etc. */
+      else {
+	if (g->verbose)
+	  fprintf (stderr, "looking for appliance in %s\n", pelem);
+
+	if (dir_contains_files (pelem, kernel_name, initrd_name, NULL)) {
+	  kernel = safe_malloc (g, len + strlen (kernel_name) + 2);
+	  initrd = safe_malloc (g, len + strlen (initrd_name) + 2);
+	  sprintf (kernel, "%s/%s", pelem, kernel_name);
+	  sprintf (initrd, "%s/%s", pelem, initrd_name);
+	  break;
+	}
+      }
+
+      pelem = pend + 1;
+    } while (pmore);
+
+    free (path);
+  }
+
+  if (kernel == NULL || initrd == NULL) {
+    error (g, _("cannot find %s or %s on LIBGUESTFS_PATH (current path = %s)"),
 	   kernel_name, initrd_name, g->path);
     goto cleanup0;
   }
 
-  /* Make the temporary directory containing the socket. */
-  if (!g->tmpdir) {
-    g->tmpdir = safe_strdup (g, dir_template);
-    if (mkdtemp (g->tmpdir) == NULL) {
-      perrorf (g, "%s: cannot create temporary directory", dir_template);
-      goto cleanup0;
-    }
-  }
+  /* Choose a suitable memory size.  Previously we tried to choose
+   * a minimal memory size, but this isn't really necessary since
+   * recent QEMU and KVM don't do anything nasty like locking
+   * memory into core any more.  Thus we can safely choose a
+   * large, generous amount of memory, and it'll just get swapped
+   * on smaller systems.
+   */
+  memsize = 384;
+
+  /* Get qemu help text and version. */
+  if (test_qemu (g) == -1)
+    goto cleanup0;
 
+  /* Make the vmchannel socket. */
   snprintf (unixsock, sizeof unixsock, "%s/sock", g->tmpdir);
   unlink (unixsock);
 
@@ -689,11 +917,12 @@ guestfs_launch (guestfs_h *g)
   if (r == 0) {			/* Child (qemu). */
     char vmchannel[256];
     char append[256];
+    char memsize_str[256];
 
     /* Set up the full command line.  Do this in the subprocess so we
      * don't need to worry about cleaning up.
      */
-    g->cmdline[0] = (char *) QEMU;
+    g->cmdline[0] = g->qemu;
 
     /* Construct the -net channel parameter for qemu. */
     snprintf (vmchannel, sizeof vmchannel,
@@ -702,11 +931,16 @@ guestfs_launch (guestfs_h *g)
 
     /* Linux kernel command line. */
     snprintf (append, sizeof append,
-	      "console=ttyS0 guestfs=%s:%d", VMCHANNEL_ADDR, VMCHANNEL_PORT);
+	      "panic=1 console=ttyS0 guestfs=%s:%d%s%s%s",
+	      VMCHANNEL_ADDR, VMCHANNEL_PORT,
+	      g->verbose ? " guestfs_verbose=1" : "",
+	      g->append ? " " : "", g->append ? g->append : "");
+
+    snprintf (memsize_str, sizeof memsize_str, "%d", memsize);
 
     add_cmdline (g, "-m");
-    add_cmdline (g, "384");	  /* XXX Choose best size. */
-    add_cmdline (g, "-no-kqemu"); /* Avoids a warning. */
+    add_cmdline (g, memsize_str);
+    add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */
     add_cmdline (g, "-kernel");
     add_cmdline (g, (char *) kernel);
     add_cmdline (g, "-initrd");
@@ -721,12 +955,21 @@ guestfs_launch (guestfs_h *g)
     add_cmdline (g, "-net");
     add_cmdline (g, "user,vlan=0");
     add_cmdline (g, "-net");
-    add_cmdline (g, "nic,vlan=0");
+    add_cmdline (g, "nic,model=virtio,vlan=0");
+
+    /* These options recommended by KVM developers to improve reliability. */
+    if (qemu_supports (g, "-no-hpet"))
+      add_cmdline (g, "-no-hpet");
+
+    if (qemu_supports (g, "-rtc-td-hack"))
+      add_cmdline (g, "-rtc-td-hack");
+
+    /* Finish off the command line. */
     incr_cmdline_size (g);
     g->cmdline[g->cmdline_size-1] = NULL;
 
     if (g->verbose) {
-      fprintf (stderr, "%s", QEMU);
+      fprintf (stderr, "%s", g->qemu);
       for (i = 0; g->cmdline[i]; ++i)
 	fprintf (stderr, " %s", g->cmdline[i]);
       fprintf (stderr, "\n");
@@ -749,14 +992,53 @@ guestfs_launch (guestfs_h *g)
     setpgid (0, 0);
 #endif
 
-    execv (QEMU, g->cmdline);	/* Run qemu. */
-    perror (QEMU);
+    execv (g->qemu, g->cmdline); /* Run qemu. */
+    perror (g->qemu);
     _exit (1);
   }
 
   /* Parent (library). */
   g->pid = r;
 
+  free (kernel);
+  kernel = NULL;
+  free (initrd);
+  initrd = NULL;
+
+  /* Fork the recovery process off which will kill qemu if the parent
+   * process fails to do so (eg. if the parent segfaults).
+   */
+  r = fork ();
+  if (r == 0) {
+    pid_t qemu_pid = g->pid;
+    pid_t parent_pid = getppid ();
+
+    /* Writing to argv is hideously complicated and error prone.  See:
+     * http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/utils/misc/ps_status.c?rev=1.33.2.1;content-type=text%2Fplain
+     */
+
+    /* Loop around waiting for one or both of the other processes to
+     * disappear.  It's fair to say this is very hairy.  The PIDs that
+     * we are looking at might be reused by another process.  We are
+     * effectively polling.  Is the cure worse than the disease?
+     */
+    for (;;) {
+      if (kill (qemu_pid, 0) == -1) /* qemu's gone away, we aren't needed */
+	_exit (0);
+      if (kill (parent_pid, 0) == -1) {
+	/* Parent's gone away, qemu still around, so kill qemu. */
+	kill (qemu_pid, 9);
+	_exit (0);
+      }
+      sleep (2);
+    }
+  }
+
+  /* Don't worry, if the fork failed, this will be -1.  The recovery
+   * process isn't essential.
+   */
+  g->recoverypid = r;
+
   /* Start the clock ... */
   time (&g->start_t);
 
@@ -798,10 +1080,9 @@ guestfs_launch (guestfs_h *g)
   addr.sun_path[UNIX_PATH_MAX-1] = '\0';
 
   tries = 100;
+  /* Always sleep at least once to give qemu a small chance to start up. */
+  usleep (10000);
   while (tries > 0) {
-    /* Always sleep at least once to give qemu a small chance to start up. */
-    usleep (10000);
-
     r = connect (g->sock, (struct sockaddr *) &addr, sizeof addr);
     if ((r == -1 && errno == EINPROGRESS) || r == 0)
       goto connected;
@@ -809,9 +1090,10 @@ guestfs_launch (guestfs_h *g)
     if (errno != ENOENT)
       perrorf (g, "connect");
     tries--;
+    usleep (100000);
   }
 
-  error (g, "failed to connect to vmchannel socket");
+  error (g, _("failed to connect to vmchannel socket"));
   goto cleanup2;
 
  connected:
@@ -830,18 +1112,12 @@ guestfs_launch (guestfs_h *g)
 			      GUESTFS_HANDLE_READABLE,
 			      stdout_event, NULL);
   if (g->stdout_watch == -1) {
-    error (g, "could not watch qemu stdout");
+    error (g, _("could not watch qemu stdout"));
     goto cleanup3;
   }
 
-  g->sock_watch =
-    g->main_loop->add_handle (g->main_loop, g, g->sock,
-			      GUESTFS_HANDLE_READABLE,
-			      sock_read_event, NULL);
-  if (g->sock_watch == -1) {
-    error (g, "could not watch daemon communications socket");
+  if (guestfs__switch_to_receiving (g) == -1)
     goto cleanup3;
-  }
 
   g->state = LAUNCHING;
   return 0;
@@ -859,11 +1135,14 @@ guestfs_launch (guestfs_h *g)
   close (wfd[1]);
   close (rfd[0]);
   kill (g->pid, 9);
+  if (g->recoverypid > 0) kill (g->recoverypid, 9);
   waitpid (g->pid, NULL, 0);
+  if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
   g->fd[0] = -1;
   g->fd[1] = -1;
   g->sock = -1;
   g->pid = 0;
+  g->recoverypid = 0;
   g->start_t = 0;
   g->stdout_watch = -1;
   g->sock_watch = -1;
@@ -874,6 +1153,127 @@ guestfs_launch (guestfs_h *g)
   return -1;
 }
 
+/* This function does the hard work of building the supermin appliance
+ * on the fly.  'path' is the directory containing the control files.
+ * 'kernel' and 'initrd' are where we will return the names of the
+ * kernel and initrd (only initrd is built).  The work is done by
+ * an external script.  We just tell it where to put the result.
+ */
+static int
+build_supermin_appliance (guestfs_h *g, const char *path,
+			  char **kernel, char **initrd)
+{
+  char cmd[4096];
+  int r, len;
+
+  len = strlen (g->tmpdir);
+  *kernel = safe_malloc (g, len + 8);
+  snprintf (*kernel, len+8, "%s/kernel", g->tmpdir);
+  *initrd = safe_malloc (g, len + 8);
+  snprintf (*initrd, len+8, "%s/initrd", g->tmpdir);
+
+  snprintf (cmd, sizeof cmd,
+	    "PATH='%s':$PATH "
+	    "libguestfs-supermin-helper '%s' %s %s",
+	    path,
+	    path, *kernel, *initrd);
+
+  r = system (cmd);
+  if (r == -1 || WEXITSTATUS(r) != 0) {
+    error (g, _("external command failed: %s"), cmd);
+    free (*kernel);
+    free (*initrd);
+    *kernel = *initrd = NULL;
+    return -1;
+  }
+
+  return 0;
+}
+
+static int read_all (guestfs_h *g, FILE *fp, char **ret);
+
+/* Test qemu binary (or wrapper) runs, and do 'qemu -help' and
+ * 'qemu -version' so we know what options this qemu supports and
+ * the version.
+ */
+static int
+test_qemu (guestfs_h *g)
+{
+  char cmd[1024];
+  FILE *fp;
+
+  free (g->qemu_help);
+  free (g->qemu_version);
+  g->qemu_help = NULL;
+  g->qemu_version = NULL;
+
+  snprintf (cmd, sizeof cmd, "'%s' -help", g->qemu);
+
+  fp = popen (cmd, "r");
+  /* qemu -help should always work (qemu -version OTOH wasn't
+   * supported by qemu 0.9).  If this command doesn't work then it
+   * probably indicates that the qemu binary is missing.
+   */
+  if (!fp) {
+    /* XXX This error is never printed, even if the qemu binary
+     * doesn't exist.  Why?
+     */
+  error:
+    perrorf (g, _("%s: command failed: If qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU environment variable."), cmd);
+    return -1;
+  }
+
+  if (read_all (g, fp, &g->qemu_help) == -1)
+    goto error;
+
+  if (pclose (fp) == -1)
+    goto error;
+
+  snprintf (cmd, sizeof cmd, "'%s' -version 2>/dev/null", g->qemu);
+
+  fp = popen (cmd, "r");
+  if (fp) {
+    /* Intentionally ignore errors. */
+    read_all (g, fp, &g->qemu_version);
+    pclose (fp);
+  }
+
+  return 0;
+}
+
+static int
+read_all (guestfs_h *g, FILE *fp, char **ret)
+{
+  int r, n = 0;
+  char *p;
+
+ again:
+  if (feof (fp)) {
+    *ret = safe_realloc (g, *ret, n + 1);
+    (*ret)[n] = '\0';
+    return n;
+  }
+
+  *ret = safe_realloc (g, *ret, n + BUFSIZ);
+  p = &(*ret)[n];
+  r = fread (p, 1, BUFSIZ, fp);
+  if (ferror (fp)) {
+    perrorf (g, "read");
+    return -1;
+  }
+  n += r;
+  goto again;
+}
+
+/* Test if option is supported by qemu command line (just by grepping
+ * the help text).
+ */
+static int
+qemu_supports (guestfs_h *g, const char *option)
+{
+  return g->qemu_help && strstr (g->qemu_help, option) != NULL;
+}
+
 static void
 finish_wait_ready (guestfs_h *g, void *vp)
 {
@@ -892,25 +1292,25 @@ guestfs_wait_ready (guestfs_h *g)
   if (g->state == READY) return 0;
 
   if (g->state == BUSY) {
-    error (g, "qemu has finished launching already");
+    error (g, _("qemu has finished launching already"));
     return -1;
   }
 
   if (g->state != LAUNCHING) {
-    error (g, "qemu has not been launched yet");
+    error (g, _("qemu has not been launched yet"));
     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;
 
   if (finished != 1) {
-    error (g, "guestfs_wait_ready failed, see earlier error messages");
+    error (g, _("guestfs_wait_ready failed, see earlier error messages"));
     return -1;
   }
 
@@ -920,7 +1320,7 @@ guestfs_wait_ready (guestfs_h *g)
    * commands after this function returns.
    */
   if (g->state != READY) {
-    error (g, "qemu launched and contacted daemon, but state != READY");
+    error (g, _("qemu launched and contacted daemon, but state != READY"));
     return -1;
   }
 
@@ -931,7 +1331,7 @@ int
 guestfs_kill_subprocess (guestfs_h *g)
 {
   if (g->state == CONFIG) {
-    error (g, "no subprocess to kill");
+    error (g, _("no subprocess to kill"));
     return -1;
   }
 
@@ -939,93 +1339,212 @@ guestfs_kill_subprocess (guestfs_h *g)
     fprintf (stderr, "sending SIGTERM to process %d\n", g->pid);
 
   kill (g->pid, SIGTERM);
+  if (g->recoverypid > 0) kill (g->recoverypid, 9);
 
   return 0;
 }
 
-/* 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.
- */
-static void
-stdout_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
-	      int watch, int fd, int events)
+/* Access current state. */
+int
+guestfs_is_config (guestfs_h *g)
 {
-  char buf[4096];
-  int n;
-
-#if 0
-  if (g->verbose)
-    fprintf (stderr,
-	     "stdout_event: %p g->state = %d, fd = %d, events = 0x%x\n",
-	     g, g->state, fd, events);
-#endif
-
-  if (g->fd[1] != fd) {
-    error (g, "stdout_event: internal error: %d != %d", g->fd[1], fd);
-    return;
-  }
-
-  n = read (fd, buf, sizeof buf);
-  if (n == 0) {
-    /* Hopefully this indicates the qemu child process has died. */
-    if (g->verbose)
-      fprintf (stderr, "stdout_event: %p: child process died\n", g);
-    /*kill (g->pid, SIGTERM);*/
-    waitpid (g->pid, NULL, 0);
-    if (g->stdout_watch >= 0)
-      g->main_loop->remove_handle (g->main_loop, g, g->stdout_watch);
-    if (g->sock_watch >= 0)
-      g->main_loop->remove_handle (g->main_loop, g, g->sock_watch);
-    close (g->fd[0]);
-    close (g->fd[1]);
-    close (g->sock);
-    g->fd[0] = -1;
-    g->fd[1] = -1;
-    g->sock = -1;
-    g->pid = 0;
-    g->start_t = 0;
-    g->stdout_watch = -1;
-    g->sock_watch = -1;
-    g->state = CONFIG;
-    if (g->subprocess_quit_cb)
-      g->subprocess_quit_cb (g, g->subprocess_quit_cb_data);
-    return;
-  }
+  return g->state == CONFIG;
+}
 
-  if (n == -1) {
-    if (errno != EAGAIN)
-      perrorf (g, "read");
-    return;
-  }
+int
+guestfs_is_launching (guestfs_h *g)
+{
+  return g->state == LAUNCHING;
+}
 
-  /* In verbose mode, copy all log messages to stderr. */
-  if (g->verbose)
-    write (2, buf, n);
+int
+guestfs_is_ready (guestfs_h *g)
+{
+  return g->state == READY;
+}
 
-  /* It's an actual log message, send it upwards if anyone is listening. */
-  if (g->log_message_cb)
-    g->log_message_cb (g, g->log_message_cb_data, buf, n);
+int
+guestfs_is_busy (guestfs_h *g)
+{
+  return g->state == BUSY;
 }
 
-/* The function is called whenever we can read something on the
- * guestfsd (daemon inside the guest) communication socket.
- */
-static void
-sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
-		 int watch, int fd, int events)
+int
+guestfs_get_state (guestfs_h *g)
 {
-  XDR xdr;
-  unsigned len;
-  int n;
+  return g->state;
+}
 
-  if (g->verbose)
-    fprintf (stderr,
+int
+guestfs_set_ready (guestfs_h *g)
+{
+  if (g->state != BUSY) {
+    error (g, _("guestfs_set_ready: called when in state %d != BUSY"),
+	   g->state);
+    return -1;
+  }
+  g->state = READY;
+  return 0;
+}
+
+int
+guestfs_set_busy (guestfs_h *g)
+{
+  if (g->state != READY) {
+    error (g, _("guestfs_set_busy: called when in state %d != READY"),
+	   g->state);
+    return -1;
+  }
+  g->state = BUSY;
+  return 0;
+}
+
+int
+guestfs_end_busy (guestfs_h *g)
+{
+  switch (g->state)
+    {
+    case BUSY:
+      g->state = READY;
+      break;
+    case CONFIG:
+    case READY:
+      break;
+    case LAUNCHING:
+    case NO_HANDLE:
+      error (g, _("guestfs_end_busy: called when in state %d"), g->state);
+      return -1;
+    }
+  return 0;
+}
+
+/* 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);
+}
+
+/* We don't know if stdout_event or sock_read_event will be the
+ * first to receive EOF if the qemu process dies.  This function
+ * has the common cleanup code for both.
+ */
+static void
+child_cleanup (guestfs_h *g)
+{
+  if (g->verbose)
+    fprintf (stderr, "stdout_event: %p: child process died\n", g);
+  /*kill (g->pid, SIGTERM);*/
+  if (g->recoverypid > 0) kill (g->recoverypid, 9);
+  waitpid (g->pid, NULL, 0);
+  if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
+  if (g->stdout_watch >= 0)
+    g->main_loop->remove_handle (g->main_loop, g, g->stdout_watch);
+  if (g->sock_watch >= 0)
+    g->main_loop->remove_handle (g->main_loop, g, g->sock_watch);
+  close (g->fd[0]);
+  close (g->fd[1]);
+  close (g->sock);
+  g->fd[0] = -1;
+  g->fd[1] = -1;
+  g->sock = -1;
+  g->pid = 0;
+  g->recoverypid = 0;
+  g->start_t = 0;
+  g->stdout_watch = -1;
+  g->sock_watch = -1;
+  g->state = CONFIG;
+  if (g->subprocess_quit_cb)
+    g->subprocess_quit_cb (g, g->subprocess_quit_cb_data);
+}
+
+/* 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.
+ */
+static void
+stdout_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
+	      int watch, int fd, int events)
+{
+  char buf[4096];
+  int n;
+
+#if 0
+  if (g->verbose)
+    fprintf (stderr,
+	     "stdout_event: %p g->state = %d, fd = %d, events = 0x%x\n",
+	     g, g->state, fd, events);
+#endif
+
+  if (g->fd[1] != fd) {
+    error (g, _("stdout_event: internal error: %d != %d"), g->fd[1], fd);
+    return;
+  }
+
+  n = read (fd, buf, sizeof buf);
+  if (n == 0) {
+    /* Hopefully this indicates the qemu child process has died. */
+    child_cleanup (g);
+    return;
+  }
+
+  if (n == -1) {
+    if (errno != EINTR && errno != EAGAIN)
+      perrorf (g, "read");
+    return;
+  }
+
+  /* In verbose mode, copy all log messages to stderr. */
+  if (g->verbose)
+    write (2, buf, n);
+
+  /* It's an actual log message, send it upwards if anyone is listening. */
+  if (g->log_message_cb)
+    g->log_message_cb (g, g->log_message_cb_data, buf, n);
+}
+
+/* The function is called whenever we can read something on the
+ * guestfsd (daemon inside the guest) communication socket.
+ */
+static void
+sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
+		 int watch, int fd, int events)
+{
+  XDR xdr;
+  u_int32_t len;
+  int n;
+
+  if (g->verbose)
+    fprintf (stderr,
 	     "sock_read_event: %p g->state = %d, fd = %d, events = 0x%x\n",
 	     g, g->state, fd, events);
 
   if (g->sock != fd) {
-    error (g, "sock_read_event: internal error: %d != %d", g->sock, fd);
+    error (g, _("sock_read_event: internal error: %d != %d"), g->sock, fd);
     return;
   }
 
@@ -1035,14 +1554,14 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
   }
   n = read (g->sock, g->msg_in + g->msg_in_size,
 	    g->msg_in_allocated - g->msg_in_size);
-  if (n == 0)
-    /* Disconnected?  Ignore it because stdout_watch will get called
-     * and will do the cleanup.
-     */
+  if (n == 0) {
+    /* Disconnected. */
+    child_cleanup (g);
     return;
+  }
 
   if (n == -1) {
-    if (errno != EAGAIN)
+    if (errno != EINTR && errno != EAGAIN)
       perrorf (g, "read");
     return;
   }
@@ -1050,11 +1569,12 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
   g->msg_in_size += n;
 
   /* Have we got enough of a message to be able to process it yet? */
+ again:
   if (g->msg_in_size < 4) return;
 
   xdrmem_create (&xdr, g->msg_in, g->msg_in_size, XDR_DECODE);
   if (!xdr_uint32_t (&xdr, &len)) {
-    error (g, "can't decode length word");
+    error (g, _("can't decode length word"));
     goto cleanup;
   }
 
@@ -1062,17 +1582,15 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
    * starts up it sends a "magic" value (longer than any possible
    * message).  Check for this.
    */
-  if (len == 0xf5f55ff5) {
+  if (len == GUESTFS_LAUNCH_FLAG) {
     if (g->state != LAUNCHING)
-      error (g, "received magic signature from guestfsd, but in state %d",
+      error (g, _("received magic signature from guestfsd, but in state %d"),
 	     g->state);
     else if (g->msg_in_size != 4)
-      error (g, "received magic signature from guestfsd, but msg size is %d",
+      error (g, _("received magic signature from guestfsd, but msg size is %d"),
 	     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);
     }
@@ -1080,24 +1598,29 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
     goto cleanup;
   }
 
-  /* If this happens, it's pretty bad and we've probably lost synchronization.*/
+  /* This can happen if a cancellation happens right at the end
+   * of us sending a FileIn parameter to the daemon.  Discard.  The
+   * daemon should send us an error message next.
+   */
+  if (len == GUESTFS_CANCEL_FLAG) {
+    g->msg_in_size -= 4;
+    memmove (g->msg_in, g->msg_in+4, g->msg_in_size);
+    goto again;
+  }
+
+  /* If this happens, it's pretty bad and we've probably lost
+   * synchronization.
+   */
   if (len > GUESTFS_MESSAGE_MAX) {
-    error (g, "message length (%u) > maximum possible size (%d)",
+    error (g, _("message length (%u) > maximum possible size (%d)"),
 	   len, GUESTFS_MESSAGE_MAX);
     goto cleanup;
   }
 
   if (g->msg_in_size-4 < len) return; /* Need more of this message. */
 
-  /* This should not happen, and if it does it probably means we've
-   * lost all hope of synchronization.
-   */
-  if (g->msg_in_size-4 > len) {
-    error (g, "len = %d, but msg_in_size-4 = %d", len, g->msg_in_size-4);
-    goto cleanup;
-  }
-
   /* Got the full message, begin processing it. */
+#if 0
   if (g->verbose) {
     int i, j;
 
@@ -1118,20 +1641,22 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
       printf ("|\n");
     }
   }
+#endif
 
   /* Not in the expected state. */
   if (g->state != BUSY)
-    error (g, "state %d != BUSY", g->state);
+    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.
-   */
-  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);
+  /* Push the message up to the higher layer. */
+  if (g->reply_cb)
+    g->reply_cb (g, g->reply_cb_data, &xdr);
+  else
+    /* This message (probably) should never be printed. */
+    fprintf (stderr, "libguesfs: sock_read_event: !!! dropped message !!!\n");
+
+  g->msg_in_size -= len + 4;
+  memmove (g->msg_in, g->msg_in+len+4, g->msg_in_size);
+  if (g->msg_in_size > 0) goto again;
 
  cleanup:
   /* Free the message buffer if it's grown excessively large. */
@@ -1160,12 +1685,12 @@ sock_write_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
 	     g, g->state, fd, events);
 
   if (g->sock != fd) {
-    error (g, "sock_write_event: internal error: %d != %d", g->sock, fd);
+    error (g, _("sock_write_event: internal error: %d != %d"), g->sock, fd);
     return;
   }
 
   if (g->state != BUSY) {
-    error (g, "sock_write_event: state %d != BUSY", g->state);
+    error (g, _("sock_write_event: state %d != BUSY"), g->state);
     return;
   }
 
@@ -1191,43 +1716,172 @@ sock_write_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
     return;
 
   if (g->verbose)
-    fprintf (stderr, "sock_write_event: done writing, switching back to reading events\n");
+    fprintf (stderr, "sock_write_event: done writing, calling send_cb\n");
 
   free (g->msg_out);
+  g->msg_out = NULL;
   g->msg_out_pos = g->msg_out_size = 0;
 
-  if (g->main_loop->remove_handle (g->main_loop, g, g->sock_watch) == -1) {
-    error (g, "remove_handle failed in sock_write_event");
-    return;
+  /* Done writing, call the higher layer. */
+  if (g->send_cb)
+    g->send_cb (g, g->send_cb_data);
+}
+
+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;
+}
+
+/* Change the daemon socket handler so that we are now writing.
+ * This sets the handle to sock_write_event.
+ */
+int
+guestfs__switch_to_sending (guestfs_h *g)
+{
+  if (g->sock_watch >= 0) {
+    if (g->main_loop->remove_handle (g->main_loop, g, g->sock_watch) == -1) {
+      error (g, _("remove_handle failed"));
+      g->sock_watch = -1;
+      return -1;
+    }
   }
+
+  g->sock_watch =
+    g->main_loop->add_handle (g->main_loop, g, g->sock,
+			      GUESTFS_HANDLE_WRITABLE,
+			      sock_write_event, NULL);
+  if (g->sock_watch == -1) {
+    error (g, _("add_handle failed"));
+    return -1;
+  }
+
+  return 0;
+}
+
+int
+guestfs__switch_to_receiving (guestfs_h *g)
+{
+  if (g->sock_watch >= 0) {
+    if (g->main_loop->remove_handle (g->main_loop, g, g->sock_watch) == -1) {
+      error (g, _("remove_handle failed"));
+      g->sock_watch = -1;
+      return -1;
+    }
+  }
+
   g->sock_watch =
     g->main_loop->add_handle (g->main_loop, g, g->sock,
 			      GUESTFS_HANDLE_READABLE,
 			      sock_read_event, NULL);
   if (g->sock_watch == -1) {
-    error (g, "add_handle failed in sock_write_event");
-    return;
+    error (g, _("add_handle failed"));
+    return -1;
   }
+
+  return 0;
 }
 
-/* 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.
+/* Dispatch a call (len + header + args) to the remote daemon,
+ * synchronously (ie. using the guest's main loop to wait until
+ * it has been sent).  Returns -1 for error, or the serial
+ * number of the message.
  */
-static int
-dispatch (guestfs_h *g, int proc_nr, xdrproc_t xdrp, char *args)
+static void
+send_cb (guestfs_h *g, void *data)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+
+  *((int *)data) = 1;
+  ml->main_loop_quit (ml, g);
+}
+
+int
+guestfs__send_sync (guestfs_h *g, int proc_nr,
+		    xdrproc_t xdrp, char *args)
 {
-  char buffer[GUESTFS_MESSAGE_MAX];
   struct guestfs_message_header hdr;
   XDR xdr;
-  unsigned len;
+  u_int32_t len;
   int serial = g->msg_next_serial++;
+  int sent;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
 
-  if (g->state != READY) {
-    error (g, "dispatch: state %d != READY", g->state);
+  if (g->state != BUSY) {
+    error (g, _("guestfs__send_sync: state %d != BUSY"), g->state);
     return -1;
   }
 
+  /* This is probably an internal error.  Or perhaps we should just
+   * free the buffer anyway?
+   */
+  if (g->msg_out != NULL) {
+    error (g, _("guestfs__send_sync: msg_out should be NULL"));
+    return -1;
+  }
+
+  /* We have to allocate this message buffer on the heap because
+   * it is quite large (although will be mostly unused).  We
+   * can't allocate it on the stack because in some environments
+   * we have quite limited stack space available, notably when
+   * running in the JVM.
+   */
+  g->msg_out = safe_malloc (g, GUESTFS_MESSAGE_MAX + 4);
+  xdrmem_create (&xdr, g->msg_out + 4, GUESTFS_MESSAGE_MAX, XDR_ENCODE);
+
   /* Serialize the header. */
   hdr.prog = GUESTFS_PROGRAM;
   hdr.vers = GUESTFS_PROTOCOL_VERSION;
@@ -1236,10 +1890,9 @@ dispatch (guestfs_h *g, int proc_nr, xdrproc_t xdrp, char *args)
   hdr.serial = serial;
   hdr.status = GUESTFS_STATUS_OK;
 
-  xdrmem_create (&xdr, buffer, sizeof buffer, XDR_ENCODE);
   if (!xdr_guestfs_message_header (&xdr, &hdr)) {
-    error (g, "xdr_guestfs_message_header failed");
-    return -1;
+    error (g, _("xdr_guestfs_message_header failed"));
+    goto cleanup1;
   }
 
   /* Serialize the args.  If any, because some message types
@@ -1247,40 +1900,33 @@ dispatch (guestfs_h *g, int proc_nr, xdrproc_t xdrp, char *args)
    */
   if (xdrp) {
     if (!(*xdrp) (&xdr, args)) {
-      error (g, "dispatch failed to marshal args");
-      return -1;
+      error (g, _("dispatch failed to marshal args"));
+      goto cleanup1;
     }
   }
 
+  /* Get the actual length of the message, resize the buffer to match
+   * the actual length, and write the length word at the beginning.
+   */
   len = xdr_getpos (&xdr);
   xdr_destroy (&xdr);
 
-  /* Allocate the outgoing message buffer. */
-  g->msg_out = safe_malloc (g, len + 4);
-
+  g->msg_out = safe_realloc (g, g->msg_out, len + 4);
   g->msg_out_size = len + 4;
   g->msg_out_pos = 0;
-  g->state = BUSY;
 
   xdrmem_create (&xdr, g->msg_out, 4, XDR_ENCODE);
-  if (!xdr_uint32_t (&xdr, &len)) {
-    error (g, "xdr_uint32_t failed in dispatch");
-    goto cleanup1;
-  }
+  xdr_uint32_t (&xdr, &len);
 
-  memcpy (g->msg_out + 4, buffer, len);
+  if (guestfs__switch_to_sending (g) == -1)
+    goto cleanup1;
 
-  /* Change the handle to sock_write_event. */
-  if (g->main_loop->remove_handle (g->main_loop, g, g->sock_watch) == -1) {
-    error (g, "remove_handle failed in dispatch");
+  sent = 0;
+  guestfs_set_send_callback (g, send_cb, &sent);
+  if (ml->main_loop_run (ml, g) == -1)
     goto cleanup1;
-  }
-  g->sock_watch =
-    g->main_loop->add_handle (g->main_loop, g, g->sock,
-			      GUESTFS_HANDLE_WRITABLE,
-			      sock_write_event, NULL);
-  if (g->sock_watch == -1) {
-    error (g, "add_handle failed in dispatch");
+  if (sent != 1) {
+    error (g, _("send failed, see earlier error messages"));
     goto cleanup1;
   }
 
@@ -1290,23 +1936,31 @@ dispatch (guestfs_h *g, int proc_nr, xdrproc_t xdrp, char *args)
   free (g->msg_out);
   g->msg_out = NULL;
   g->msg_out_size = 0;
-  g->state = READY;
   return -1;
 }
 
-#if 0
 static int cancel = 0; /* XXX Implement file cancellation. */
-
-static int
-send_file (guestfs_h *g, const char *filename)
+static int send_file_chunk_sync (guestfs_h *g, int cancel, const char *buf, size_t len);
+static int send_file_data_sync (guestfs_h *g, const char *buf, size_t len);
+static int send_file_cancellation_sync (guestfs_h *g);
+static int send_file_complete_sync (guestfs_h *g);
+
+/* Synchronously send a file.
+ * Returns:
+ *   0 OK
+ *   -1 error
+ *   -2 daemon cancelled (we must read the error message)
+ */
+int
+guestfs__send_file_sync (guestfs_h *g, const char *filename)
 {
   char buf[GUESTFS_MAX_CHUNK_SIZE];
-  int fd, r;
+  int fd, r, err;
 
   fd = open (filename, O_RDONLY);
   if (fd == -1) {
     perrorf (g, "open: %s", filename);
-    send_file_cancellation (g);
+    send_file_cancellation_sync (g);
     /* Daemon sees cancellation and won't reply, so caller can
      * just return here.
      */
@@ -1314,19 +1968,27 @@ send_file (guestfs_h *g, const char *filename)
   }
 
   /* Send file in chunked encoding. */
-  while (!cancel && (r = read (fd, buf, sizeof buf)) > 0) {
-    if (send_file_data (g, buf, r) == -1)
-      return -1;
+  while (!cancel) {
+    r = read (fd, buf, sizeof buf);
+    if (r == -1 && (errno == EINTR || errno == EAGAIN))
+      continue;
+    if (r <= 0) break;
+    err = send_file_data_sync (g, buf, r);
+    if (err < 0) {
+      if (err == -2)		/* daemon sent cancellation */
+	send_file_cancellation_sync (g);
+      return err;
+    }
   }
 
-  if (cancel) {
-    send_file_cancellation (g);
+  if (cancel) {			/* cancel from either end */
+    send_file_cancellation_sync (g);
     return -1;
   }
 
   if (r == -1) {
     perrorf (g, "read: %s", filename);
-    send_file_cancellation (g);
+    send_file_cancellation_sync (g);
     return -1;
   }
 
@@ -1335,61 +1997,107 @@ send_file (guestfs_h *g, const char *filename)
    */
   if (close (fd) == -1) {
     perrorf (g, "close: %s", filename);
-    send_file_cancellation (g);
+    send_file_cancellation_sync (g);
     return -1;
   }
 
-  return send_file_complete (g);
+  return send_file_complete_sync (g);
 }
 
-/* Send a chunk, cancellation or end of file, wait for it to go. */
+/* Send a chunk of file data. */
 static int
-send_file_chunk (guestfs_h *g, int cancel, const char *buf, size_t len)
+send_file_data_sync (guestfs_h *g, const char *buf, size_t len)
 {
-  void *data;
+  return send_file_chunk_sync (g, 0, buf, len);
+}
+
+/* Send a cancellation message. */
+static int
+send_file_cancellation_sync (guestfs_h *g)
+{
+  return send_file_chunk_sync (g, 1, NULL, 0);
+}
+
+/* Send a file complete chunk. */
+static int
+send_file_complete_sync (guestfs_h *g)
+{
+  char buf[1];
+  return send_file_chunk_sync (g, 0, buf, 0);
+}
+
+/* Send a chunk, cancellation or end of file, synchronously (ie. wait
+ * for it to go).
+ */
+static int check_for_daemon_cancellation (guestfs_h *g);
+
+static int
+send_file_chunk_sync (guestfs_h *g, int cancel, const char *buf, size_t buflen)
+{
+  u_int32_t len;
+  int sent;
   guestfs_chunk chunk;
   XDR xdr;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
 
   if (g->state != BUSY) {
-    error (g, "send_file_chunk: state %d != READY", g->state);
+    error (g, _("send_file_chunk_sync: state %d != READY"), g->state);
+    return -1;
+  }
+
+  /* This is probably an internal error.  Or perhaps we should just
+   * free the buffer anyway?
+   */
+  if (g->msg_out != NULL) {
+    error (g, _("guestfs__send_sync: msg_out should be NULL"));
     return -1;
   }
 
+  /* Did the daemon send a cancellation message? */
+  if (check_for_daemon_cancellation (g)) {
+    if (g->verbose)
+      fprintf (stderr, "got daemon cancellation\n");
+    return -2;
+  }
+
+  /* Allocate the chunk buffer.  Don't use the stack to avoid
+   * excessive stack usage and unnecessary copies.
+   */
+  g->msg_out = safe_malloc (g, GUESTFS_MAX_CHUNK_SIZE + 4 + 48);
+  xdrmem_create (&xdr, g->msg_out + 4, GUESTFS_MAX_CHUNK_SIZE + 48, XDR_ENCODE);
+
   /* Serialize the chunk. */
   chunk.cancel = cancel;
-  chunk.data.data_len = len;
+  chunk.data.data_len = buflen;
   chunk.data.data_val = (char *) buf;
 
-  data = safe_malloc (g, GUESTFS_MAX_CHUNK_SIZE + 48);
-  xdrmem_create (&xdr, data, GUESTFS_MAX_CHUNK_SIZE + 48, XDR_ENCODE);
-  if (xdr_guestfs_chunk (&xdr, &chunk)) {
-    error (g, "xdr_guestfs_chunk failed");
-    free (data);
-    return -1;
+  if (!xdr_guestfs_chunk (&xdr, &chunk)) {
+    error (g, _("xdr_guestfs_chunk failed (buf = %p, buflen = %zu)"),
+	   buf, buflen);
+    xdr_destroy (&xdr);
+    goto cleanup1;
   }
 
-  chunkdatalen = xdr_getpos (&xdr);
-  xdr_destroy (&xdr);
-
   len = xdr_getpos (&xdr);
   xdr_destroy (&xdr);
 
-  data = safe_realloc (g, data, len);
-  g->msg_out = data;
-  g->msg_out_size = len;
+  /* Reduce the size of the outgoing message buffer to the real length. */
+  g->msg_out = safe_realloc (g, g->msg_out, len + 4);
+  g->msg_out_size = len + 4;
   g->msg_out_pos = 0;
 
-  /* Change the handle to sock_write_event. */
-  if (g->main_loop->remove_handle (g->main_loop, g, g->sock_watch) == -1) {
-    error (g, "remove_handle failed in dispatch");
+  xdrmem_create (&xdr, g->msg_out, 4, XDR_ENCODE);
+  xdr_uint32_t (&xdr, &len);
+
+  if (guestfs__switch_to_sending (g) == -1)
     goto cleanup1;
-  }
-  g->sock_watch =
-    g->main_loop->add_handle (g->main_loop, g, g->sock,
-			      GUESTFS_HANDLE_WRITABLE,
-			      sock_write_event, NULL);
-  if (g->sock_watch == -1) {
-    error (g, "add_handle failed in dispatch");
+
+  sent = 0;
+  guestfs_set_send_callback (g, send_cb, &sent);
+  if (ml->main_loop_run (ml, g) == -1)
+    goto cleanup1;
+  if (sent != 1) {
+    error (g, _("send file chunk failed, see earlier error messages"));
     goto cleanup1;
   }
 
@@ -1399,100 +2107,231 @@ send_file_chunk (guestfs_h *g, int cancel, const char *buf, size_t len)
   free (g->msg_out);
   g->msg_out = NULL;
   g->msg_out_size = 0;
-  g->state = READY;
   return -1;
 }
 
-/* Send a chunk of file data. */
+/* At this point we are sending FileIn file(s) to the guest, and not
+ * expecting to read anything, so if we do read anything, it must be
+ * a cancellation message.  This checks for this case without blocking.
+ */
 static int
-send_file_data (guestfs_h *g, const char *buf, size_t len)
+check_for_daemon_cancellation (guestfs_h *g)
 {
-  return send_file_chunk (g, 0, buf, len);
-}
+  fd_set rset;
+  struct timeval tv;
+  int r;
+  char buf[4];
+  uint32_t flag;
+  XDR xdr;
 
-/* Send a cancellation message. */
-static int
-send_file_cancellation (guestfs_h *g)
-{
-  char buf[1];
-  return send_file_chunk (g, 1, buf, 0);
-}
+  FD_ZERO (&rset);
+  FD_SET (g->sock, &rset);
+  tv.tv_sec = 0;
+  tv.tv_usec = 0;
+  r = select (g->sock+1, &rset, NULL, NULL, &tv);
+  if (r == -1) {
+    perrorf (g, "select");
+    return 0;
+  }
+  if (r == 0)
+    return 0;
 
-/* Send a file complete chunk. */
-static int
-send_file_complete (guestfs_h *g)
-{
-  char buf[0];
-  return send_file_chunk (g, 0, buf, 0);
+  /* Read the message from the daemon. */
+  r = xread (g->sock, buf, sizeof buf);
+  if (r == -1) {
+    perrorf (g, "read");
+    return 0;
+  }
+
+  xdrmem_create (&xdr, buf, sizeof buf, XDR_DECODE);
+  xdr_uint32_t (&xdr, &flag);
+  xdr_destroy (&xdr);
+
+  if (flag != GUESTFS_CANCEL_FLAG) {
+    error (g, _("check_for_daemon_cancellation: read 0x%x from daemon, expected 0x%x\n"),
+	   flag, GUESTFS_CANCEL_FLAG);
+    return 0;
+  }
+
+  return 1;
 }
-#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)
+/* Synchronously receive a file. */
+
+/* Returns -1 = error, 0 = EOF, 1 = more data */
+static int receive_file_data_sync (guestfs_h *g, void **buf, size_t *len);
+
+int
+guestfs__receive_file_sync (guestfs_h *g, const char *filename)
 {
-  if (hdr->prog != GUESTFS_PROGRAM) {
-    error (g, "wrong program (%d/%d)", hdr->prog, GUESTFS_PROGRAM);
-    return -1;
+  void *buf;
+  int fd, r;
+  size_t len;
+
+  fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
+  if (fd == -1) {
+    perrorf (g, "open: %s", filename);
+    goto cancel;
   }
-  if (hdr->vers != GUESTFS_PROTOCOL_VERSION) {
-    error (g, "wrong protocol version (%d/%d)",
-	   hdr->vers, GUESTFS_PROTOCOL_VERSION);
-    return -1;
+
+  /* Receive the file in chunked encoding. */
+  while ((r = receive_file_data_sync (g, &buf, &len)) >= 0) {
+    if (xwrite (fd, buf, len) == -1) {
+      perrorf (g, "%s: write", filename);
+      free (buf);
+      goto cancel;
+    }
+    free (buf);
+    if (r == 0) break; /* End of file. */
   }
-  if (hdr->direction != GUESTFS_DIRECTION_REPLY) {
-    error (g, "unexpected message direction (%d/%d)",
-	   hdr->direction, GUESTFS_DIRECTION_REPLY);
+
+  if (r == -1) {
+    error (g, _("%s: error in chunked encoding"), filename);
     return -1;
   }
-  if (hdr->proc != proc_nr) {
-    error (g, "unexpected procedure number (%d/%d)", hdr->proc, proc_nr);
+
+  if (close (fd) == -1) {
+    perrorf (g, "close: %s", filename);
     return -1;
   }
-  if (hdr->serial != serial) {
-    error (g, "unexpected serial (%d/%d)", hdr->serial, serial);
+
+  return 0;
+
+ cancel: ;
+  /* Send cancellation message to daemon, then wait until it
+   * cancels (just throwing away data).
+   */
+  XDR xdr;
+  char fbuf[4];
+  uint32_t flag = GUESTFS_CANCEL_FLAG;
+
+  xdrmem_create (&xdr, fbuf, sizeof fbuf, XDR_ENCODE);
+  xdr_uint32_t (&xdr, &flag);
+  xdr_destroy (&xdr);
+
+  if (xwrite (g->sock, fbuf, sizeof fbuf) == -1) {
+    perrorf (g, _("write to daemon socket"));
     return -1;
   }
 
-  return 0;
+  while ((r = receive_file_data_sync (g, NULL, NULL)) > 0)
+    ;				/* just discard it */
+
+  return -1;
 }
 
-/* The high-level actions are autogenerated by generator.ml.  Include
- * them here.
+/* Note that the reply callback can be called multiple times before
+ * the main loop quits and we get back to the synchronous code.  So
+ * we have to be prepared to save multiple chunks on a list here.
  */
-#include "guestfs-actions.c"
+struct receive_file_ctx {
+  int count;			/* 0 if receive_file_cb not called, or
+				 * else count number of chunks.
+				 */
+  guestfs_chunk *chunks;	/* Array of chunks. */
+};
 
-/* 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)
+static void
+free_chunks (struct receive_file_ctx *ctx)
 {
-  free (x);
-}
+  int i;
 
-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);
+  for (i = 0; i < ctx->count; ++i)
+    free (ctx->chunks[i].data.data_val);
+
+  free (ctx->chunks);
 }
 
-void
-guestfs_free_lvm_vg_list (struct guestfs_lvm_vg_list *x)
+static void
+receive_file_cb (guestfs_h *g, void *data, XDR *xdr)
 {
-  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_vg_list, (char *) x);
-  free (x);
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct receive_file_ctx *ctx = (struct receive_file_ctx *) data;
+  guestfs_chunk chunk;
+
+  if (ctx->count == -1)		/* Parse error occurred previously. */
+    return;
+
+  ml->main_loop_quit (ml, g);
+
+  memset (&chunk, 0, sizeof chunk);
+
+  if (!xdr_guestfs_chunk (xdr, &chunk)) {
+    error (g, _("failed to parse file chunk"));
+    free_chunks (ctx);
+    ctx->chunks = NULL;
+    ctx->count = -1;
+    return;
+  }
+
+  /* Copy the chunk to the list. */
+  ctx->chunks = safe_realloc (g, ctx->chunks,
+			      sizeof (guestfs_chunk) * (ctx->count+1));
+  ctx->chunks[ctx->count] = chunk;
+  ctx->count++;
 }
 
-void
-guestfs_free_lvm_lv_list (struct guestfs_lvm_lv_list *x)
+/* Receive a chunk of file data. */
+/* Returns -1 = error, 0 = EOF, 1 = more data */
+static int
+receive_file_data_sync (guestfs_h *g, void **buf, size_t *len_r)
 {
-  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_lv_list, (char *) x);
-  free (x);
+  struct receive_file_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int i;
+  size_t len;
+
+  ctx.count = 0;
+  ctx.chunks = NULL;
+
+  guestfs_set_reply_callback (g, receive_file_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+
+  if (ctx.count == 0) {
+    error (g, _("receive_file_data_sync: reply callback not called\n"));
+    return -1;
+  }
+
+  if (ctx.count == -1) {
+    error (g, _("receive_file_data_sync: parse error in reply callback\n"));
+    /* callback already freed the chunks */
+    return -1;
+  }
+
+  if (g->verbose)
+    fprintf (stderr, "receive_file_data_sync: got %d chunks\n", ctx.count);
+
+  /* Process each chunk in the list. */
+  if (buf) *buf = NULL;		/* Accumulate data in this buffer. */
+  len = 0;
+
+  for (i = 0; i < ctx.count; ++i) {
+    if (ctx.chunks[i].cancel) {
+      error (g, _("file receive cancelled by daemon"));
+      free_chunks (&ctx);
+      if (buf) free (*buf);
+      if (len_r) *len_r = 0;
+      return -1;
+    }
+
+    if (ctx.chunks[i].data.data_len == 0) { /* end of transfer */
+      free_chunks (&ctx);
+      if (len_r) *len_r = len;
+      return 0;
+    }
+
+    if (buf) {
+      *buf = safe_realloc (g, *buf, len + ctx.chunks[i].data.data_len);
+      memcpy (*buf+len, ctx.chunks[i].data.data_val,
+	      ctx.chunks[i].data.data_len);
+    }
+    len += ctx.chunks[i].data.data_len;
+  }
+
+  if (len_r) *len_r = len;
+  free_chunks (&ctx);
+  return 1;
 }
 
 /* This is the default main loop implementation, using select(2). */
@@ -1504,7 +2343,7 @@ select_add_handle (guestfs_main_loop *mlv, guestfs_h *g, int fd, int events,
   struct select_main_loop *ml = (struct select_main_loop *) mlv;
 
   if (fd < 0 || fd >= FD_SETSIZE) {
-    error (g, "fd %d is out of range", fd);
+    error (g, _("fd %d is out of range"), fd);
     return -1;
   }
 
@@ -1512,24 +2351,24 @@ select_add_handle (guestfs_main_loop *mlv, guestfs_h *g, int fd, int events,
 		  GUESTFS_HANDLE_WRITABLE |
 		  GUESTFS_HANDLE_HANGUP |
 		  GUESTFS_HANDLE_ERROR)) != 0) {
-    error (g, "set of events (0x%x) contains unknown events", events);
+    error (g, _("set of events (0x%x) contains unknown events"), events);
     return -1;
   }
 
   if (events == 0) {
-    error (g, "set of events is empty");
+    error (g, _("set of events is empty"));
     return -1;
   }
 
   if (FD_ISSET (fd, &ml->rset) ||
       FD_ISSET (fd, &ml->wset) ||
       FD_ISSET (fd, &ml->xset)) {
-    error (g, "fd %d is already registered", fd);
+    error (g, _("fd %d is already registered"), fd);
     return -1;
   }
 
   if (cb == NULL) {
-    error (g, "callback is NULL");
+    error (g, _("callback is NULL"));
     return -1;
   }
 
@@ -1562,14 +2401,14 @@ select_remove_handle (guestfs_main_loop *mlv, guestfs_h *g, int fd)
   struct select_main_loop *ml = (struct select_main_loop *) mlv;
 
   if (fd < 0 || fd >= FD_SETSIZE) {
-    error (g, "fd %d is out of range", fd);
+    error (g, _("fd %d is out of range"), fd);
     return -1;
   }
 
   if (!FD_ISSET (fd, &ml->rset) &&
       !FD_ISSET (fd, &ml->wset) &&
       !FD_ISSET (fd, &ml->xset)) {
-    error (g, "fd %d was not registered", fd);
+    error (g, _("fd %d was not registered"), fd);
     return -1;
   }
 
@@ -1618,7 +2457,7 @@ select_main_loop_run (guestfs_main_loop *mlv, guestfs_h *g)
   fd_set rset2, wset2, xset2;
 
   if (ml->is_running) {
-    error (g, "select_main_loop_run: this cannot be called recursively");
+    error (g, _("select_main_loop_run: this cannot be called recursively"));
     return -1;
   }
 
@@ -1633,6 +2472,8 @@ select_main_loop_run (guestfs_main_loop *mlv, guestfs_h *g)
     xset2 = ml->xset;
     r = select (ml->max_fd+1, &rset2, &wset2, &xset2, NULL);
     if (r == -1) {
+      if (errno == EINTR || errno == EAGAIN)
+	continue;
       perrorf (g, "select");
       ml->is_running = 0;
       return -1;
@@ -1665,10 +2506,9 @@ select_main_loop_quit (guestfs_main_loop *mlv, guestfs_h *g)
 {
   struct select_main_loop *ml = (struct select_main_loop *) mlv;
 
-  if (!ml->is_running) {
-    error (g, "cannot quit, we are not running in a main loop");
-    return -1;
-  }
+  /* Note that legitimately ml->is_running can be zero when
+   * this function is called.
+   */
 
   ml->is_running = 0;
   return 0;