X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs.c;h=db6db9107c636b2a416695e0635ea7db46f428db;hp=43571af7e46ff56e118dd1d3eea3fcdd154a3660;hb=10258cadd0067cb49b89faf1ce424b1c01f5a7c3;hpb=1ed352b5dd07ee6068e0255e17bf81dc609af702

diff --git a/src/guestfs.c b/src/guestfs.c
index 43571af..db6db91 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1,5 +1,5 @@
 /* libguestfs
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
@@ -31,6 +32,7 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <sys/select.h>
+#include <dirent.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
@@ -58,6 +60,15 @@
 #include "guestfs.h"
 #include "guestfs_protocol.h"
 
+#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
@@ -152,14 +163,19 @@ 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;
-  const char *qemu;
+  char *path;			/* Path to kernel, initrd. */
+  char *qemu;			/* Qemu binary. */
+  char *append;			/* Append to kernel command line. */
+
+  int memsize;			/* Size of RAM (megabytes). */
 
   char *last_error;
 
@@ -220,10 +236,34 @@ guestfs_create (void)
   g->verbose = str != NULL && strcmp (str, "1") == 0;
 
   str = getenv ("LIBGUESTFS_PATH");
-  g->path = str != NULL ? str : GUESTFS_DEFAULT_PATH;
+  g->path = str != NULL ? strdup (str) : strdup (GUESTFS_DEFAULT_PATH);
+  if (!g->path) goto error;
 
   str = getenv ("LIBGUESTFS_QEMU");
-  g->qemu = str != NULL ? str : QEMU;
+  g->qemu = str != NULL ? strdup (str) : strdup (QEMU);
+  if (!g->qemu) goto error;
+
+  str = getenv ("LIBGUESTFS_APPEND");
+  if (str) {
+    g->append = strdup (str);
+    if (!g->append) goto error;
+  }
+
+  /* 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.
+   */
+  str = getenv ("LIBGUESTFS_MEMSIZE");
+  if (str) {
+    if (sscanf (str, "%d", &g->memsize) != 1 || g->memsize <= 256) {
+      fprintf (stderr, "libguestfs: non-numeric or too small value for LIBGUESTFS_MEMSIZE\n");
+      goto error;
+    }
+  } else
+    g->memsize = 500;
 
   g->main_loop = guestfs_get_default_main_loop ();
 
@@ -248,6 +288,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
@@ -259,7 +306,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;
   }
 
@@ -280,10 +327,35 @@ guestfs_close (guestfs_h *g)
   if (g->state != CONFIG)
     guestfs_kill_subprocess (g);
 
+  /* Close any sockets and deregister any handlers. */
+  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);
+  g->stdout_watch = -1;
+  g->sock_watch = -1;
+
+  if (g->fd[0] >= 0)
+    close (g->fd[0]);
+  if (g->fd[1] >= 0)
+    close (g->fd[1]);
+  if (g->sock >= 0)
+    close (g->sock);
+  g->fd[0] = -1;
+  g->fd[1] = -1;
+  g->sock = -1;
+
+  /* Remove tmpfiles. */
   if (g->tmpdir) {
     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);
@@ -311,6 +383,11 @@ guestfs_close (guestfs_h *g)
   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);
 }
 
@@ -337,7 +414,7 @@ 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);
 }
 
 void
@@ -347,9 +424,11 @@ guestfs_error (guestfs_h *g, const char *fs, ...)
   char *msg;
 
   va_start (args, fs);
-  vasprintf (&msg, fs, args);
+  int err = vasprintf (&msg, fs, args);
   va_end (args);
 
+  if (err < 0) return;
+
   if (g->error_cb) g->error_cb (g, g->error_cb_data, msg);
   set_last_error (g, msg);
 
@@ -390,15 +469,51 @@ 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;
 }
 
+/* Return 1 if an array of N objects, each of size S, cannot exist due
+   to size arithmetic overflow.  S must be positive and N must be
+   nonnegative.  This is a macro, not an inline function, so that it
+   works correctly even when SIZE_MAX < N.
+
+   By gnulib convention, SIZE_MAX represents overflow in size
+   calculations, so the conservative dividend to use here is
+   SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value.
+   However, malloc (SIZE_MAX) fails on all known hosts where
+   sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for
+   exactly-SIZE_MAX allocations on such hosts; this avoids a test and
+   branch when S is known to be 1.  */
+# define xalloc_oversized(n, s) \
+    ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
+
+/* Technically we should add an autoconf test for this, testing for the desired
+   functionality, like what's done in gnulib, but for now, this is fine.  */
+#define HAVE_GNU_CALLOC (__GLIBC__ >= 2)
+
+/* Allocate zeroed memory for N elements of S bytes, with error
+   checking.  S must be nonzero.  */
+void *
+guestfs_safe_calloc (guestfs_h *g, size_t n, size_t s)
+{
+  /* From gnulib's calloc function in xmalloc.c.  */
+  void *p;
+  /* Test for overflow, since some calloc implementations don't have
+     proper overflow checks.  But omit overflow and size-zero tests if
+     HAVE_GNU_CALLOC, since GNU calloc catches overflow and never
+     returns NULL if successful.  */
+  if ((! HAVE_GNU_CALLOC && xalloc_oversized (n, s))
+      || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0)))
+    g->abort_cb ();
+  return p;
+}
+
 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;
 }
 
@@ -511,10 +626,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;
 }
 
@@ -527,10 +644,10 @@ guestfs_get_path (guestfs_h *g)
 int
 guestfs_set_qemu (guestfs_h *g, const char *qemu)
 {
-  if (qemu == NULL)
-    g->qemu = QEMU;
-  else
-    g->qemu = qemu;
+  free (g->qemu);
+  g->qemu = NULL;
+
+  g->qemu = qemu == NULL ? safe_strdup (g, QEMU) : safe_strdup (g, qemu);
   return 0;
 }
 
@@ -540,6 +657,59 @@ 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;
+}
+
+int
+guestfs_set_memsize (guestfs_h *g, int memsize)
+{
+  g->memsize = memsize;
+  return 0;
+}
+
+int
+guestfs_get_memsize (guestfs_h *g)
+{
+  return g->memsize;
+}
+
+int
+guestfs_get_pid (guestfs_h *g)
+{
+  if (g->pid > 0)
+    return g->pid;
+  else {
+    error (g, "get_pid: no qemu subprocess");
+    return -1;
+  }
+}
+
+struct guestfs_version *
+guestfs_version (guestfs_h *g)
+{
+  struct guestfs_version *r;
+
+  r = safe_malloc (g, sizeof *r);
+  r->major = PACKAGE_VERSION_MAJOR;
+  r->minor = PACKAGE_VERSION_MINOR;
+  r->release = PACKAGE_VERSION_RELEASE;
+  r->extra = safe_strdup (g, PACKAGE_VERSION_EXTRA);
+  return r;
+}
+
 /* Add a string to the current command line. */
 static void
 incr_cmdline_size (guestfs_h *g)
@@ -559,7 +729,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;
   }
 
@@ -573,7 +744,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;
   }
 
@@ -584,11 +755,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;
   }
 
@@ -608,7 +778,29 @@ guestfs_add_drive (guestfs_h *g, const char *filename)
   char buf[len];
 
   if (strchr (filename, ',') != NULL) {
-    error (g, "filename cannot contain ',' (comma) character");
+    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,if=%s", filename, DRIVE_IF);
+
+  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"));
     return -1;
   }
 
@@ -617,7 +809,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,if=%s", filename, DRIVE_IF);
 
   return guestfs_config (g, "-drive", buf);
 }
@@ -626,7 +818,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;
   }
 
@@ -638,33 +830,96 @@ 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, pmore, memsize;
+  const char *tmpdir;
+  char dir_template[PATH_MAX];
+  int r, i, pmore;
   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];
   struct sockaddr_un addr;
 
+#ifdef P_tmpdir
+  tmpdir = P_tmpdir;
+#else
+  tmpdir = "/tmp";
+#endif
+
+  tmpdir = getenv ("TMPDIR") ? : tmpdir;
+  snprintf (dir_template, sizeof dir_template, "%s/libguestfsXXXXXX", tmpdir);
+
   /* 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, ':');
@@ -672,32 +927,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;
@@ -706,29 +960,56 @@ 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;
   }
 
-  /* 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.  This we can safely choose a
-   * large, generous amount of memory, and it'll just get swapped
-   * on smaller systems.
-   */
-  memsize = 384;
-
-  /* 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;
-    }
-  }
+  /* 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);
 
@@ -755,26 +1036,26 @@ guestfs_launch (guestfs_h *g)
     /* 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 *) g->qemu;
+    g->cmdline[0] = g->qemu;
 
-    /* Construct the -net channel parameter for qemu. */
-    snprintf (vmchannel, sizeof vmchannel,
-	      "channel,%d:unix:%s,server,nowait",
-	      VMCHANNEL_PORT, unixsock);
+#define LINUX_CMDLINE							\
+    "panic=1 "         /* force kernel to panic if daemon exits */	\
+    "console=ttyS0 "   /* serial console */				\
+    "udevtimeout=300 " /* good for very slow systems (RHBZ#480319) */	\
+    "noapic "          /* workaround for RHBZ#502058 - ok if not SMP */ \
+    "acpi=off "        /* we don't need ACPI, turn it off */
 
     /* Linux kernel command line. */
     snprintf (append, sizeof append,
-	      "panic=1 console=ttyS0 guestfs=%s:%d%s",
+	      LINUX_CMDLINE "guestfs=%s:%d%s%s%s",
 	      VMCHANNEL_ADDR, VMCHANNEL_PORT,
-	      g->verbose ? " guestfs_verbose=1" : "");
+	      g->verbose ? " guestfs_verbose=1" : "",
+	      g->append ? " " : "", g->append ? g->append : "");
 
-    snprintf (memsize_str, sizeof memsize_str, "%d", memsize);
+    snprintf (memsize_str, sizeof memsize_str, "%d", g->memsize);
 
     add_cmdline (g, "-m");
     add_cmdline (g, memsize_str);
-#if 0
-    add_cmdline (g, "-no-kqemu"); /* Avoids a warning. */
-#endif
     add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */
     add_cmdline (g, "-kernel");
     add_cmdline (g, (char *) kernel);
@@ -785,12 +1066,49 @@ guestfs_launch (guestfs_h *g)
     add_cmdline (g, "-nographic");
     add_cmdline (g, "-serial");
     add_cmdline (g, "stdio");
-    add_cmdline (g, "-net");
-    add_cmdline (g, vmchannel);
-    add_cmdline (g, "-net");
-    add_cmdline (g, "user,vlan=0");
+
+#if 0
+    /* Doesn't work.  See:
+     * http://lists.gnu.org/archive/html/qemu-devel/2009-07/threads.html
+     * Subject "guestfwd option doesn't allow supplementary ,server,nowait"
+     */
+    if (qemu_supports (g, "guestfwd")) {
+      /* New-style -net user,guestfwd=... syntax for vmchannel.  See:
+       * http://git.savannah.gnu.org/cgit/qemu.git/commit/?id=c92ef6a22d3c71538fcc48fb61ad353f7ba03b62
+       */
+      snprintf (vmchannel, sizeof vmchannel,
+		"user,vlan=0,guestfwd=tcp:%s:%d-unix:%s,server,nowait",
+		VMCHANNEL_ADDR, VMCHANNEL_PORT, unixsock);
+
+      add_cmdline (g, "-net");
+      add_cmdline (g, vmchannel);
+    } else {
+#endif
+      /* Not guestfwd.  HOPEFULLY this qemu uses the older -net channel
+       * syntax, or if not then we'll get a quick failure.
+       */
+      snprintf (vmchannel, sizeof vmchannel,
+		"channel,%d:unix:%s,server,nowait",
+		VMCHANNEL_PORT, unixsock);
+
+      add_cmdline (g, "-net");
+      add_cmdline (g, vmchannel);
+      add_cmdline (g, "-net");
+      add_cmdline (g, "user,vlan=0");
+#if 0
+    }
+#endif
     add_cmdline (g, "-net");
     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;
 
@@ -919,7 +1237,7 @@ guestfs_launch (guestfs_h *g)
     usleep (100000);
   }
 
-  error (g, "failed to connect to vmchannel socket");
+  error (g, _("failed to connect to vmchannel socket"));
   goto cleanup2;
 
  connected:
@@ -938,7 +1256,7 @@ 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;
   }
 
@@ -979,6 +1297,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)
 {
@@ -997,12 +1436,12 @@ 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;
   }
 
@@ -1015,7 +1454,7 @@ guestfs_wait_ready (guestfs_h *g)
   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;
   }
 
@@ -1025,7 +1464,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;
   }
 
@@ -1036,7 +1475,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;
   }
 
@@ -1084,7 +1523,8 @@ int
 guestfs_set_ready (guestfs_h *g)
 {
   if (g->state != BUSY) {
-    error (g, "guestfs_set_ready: called when in state %d != BUSY", g->state);
+    error (g, _("guestfs_set_ready: called when in state %d != BUSY"),
+	   g->state);
     return -1;
   }
   g->state = READY;
@@ -1095,7 +1535,8 @@ int
 guestfs_set_busy (guestfs_h *g)
 {
   if (g->state != READY) {
-    error (g, "guestfs_set_busy: called when in state %d != READY", g->state);
+    error (g, _("guestfs_set_busy: called when in state %d != READY"),
+	   g->state);
     return -1;
   }
   g->state = BUSY;
@@ -1115,43 +1556,12 @@ guestfs_end_busy (guestfs_h *g)
       break;
     case LAUNCHING:
     case NO_HANDLE:
-      error (g, "guestfs_end_busy: called when in state %d", g->state);
+      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.
@@ -1204,7 +1614,7 @@ stdout_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
 #endif
 
   if (g->fd[1] != fd) {
-    error (g, "stdout_event: internal error: %d != %d", g->fd[1], fd);
+    error (g, _("stdout_event: internal error: %d != %d"), g->fd[1], fd);
     return;
   }
 
@@ -1247,7 +1657,7 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
 	     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;
   }
 
@@ -1277,7 +1687,7 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
 
   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;
   }
 
@@ -1287,10 +1697,10 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
    */
   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;
@@ -1315,7 +1725,7 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
    * 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;
   }
@@ -1348,7 +1758,7 @@ sock_read_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
 
   /* 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. */
   if (g->reply_cb)
@@ -1380,7 +1790,7 @@ static void
 sock_write_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
 		  int watch, int fd, int events)
 {
-  int n;
+  int n, err;
 
   if (g->verbose)
     fprintf (stderr,
@@ -1388,12 +1798,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;
   }
 
@@ -1404,8 +1814,11 @@ sock_write_event (struct guestfs_main_loop *ml, guestfs_h *g, void *data,
   n = write (g->sock, g->msg_out + g->msg_out_pos,
 	     g->msg_out_size - g->msg_out_pos);
   if (n == -1) {
-    if (errno != EAGAIN)
+    err = errno;
+    if (err != EAGAIN)
       perrorf (g, "write");
+    if (err == EPIPE)	/* Disconnected from guest (RHBZ#508713). */
+      child_cleanup (g);
     return;
   }
 
@@ -1497,7 +1910,7 @@ 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");
+      error (g, _("remove_handle failed"));
       g->sock_watch = -1;
       return -1;
     }
@@ -1508,7 +1921,7 @@ guestfs__switch_to_sending (guestfs_h *g)
 			      GUESTFS_HANDLE_WRITABLE,
 			      sock_write_event, NULL);
   if (g->sock_watch == -1) {
-    error (g, "add_handle failed");
+    error (g, _("add_handle failed"));
     return -1;
   }
 
@@ -1520,7 +1933,7 @@ 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");
+      error (g, _("remove_handle failed"));
       g->sock_watch = -1;
       return -1;
     }
@@ -1531,7 +1944,7 @@ guestfs__switch_to_receiving (guestfs_h *g)
 			      GUESTFS_HANDLE_READABLE,
 			      sock_read_event, NULL);
   if (g->sock_watch == -1) {
-    error (g, "add_handle failed");
+    error (g, _("add_handle failed"));
     return -1;
   }
 
@@ -1564,7 +1977,7 @@ guestfs__send_sync (guestfs_h *g, int proc_nr,
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
 
   if (g->state != BUSY) {
-    error (g, "guestfs__send_sync: state %d != BUSY", g->state);
+    error (g, _("guestfs__send_sync: state %d != BUSY"), g->state);
     return -1;
   }
 
@@ -1572,7 +1985,7 @@ guestfs__send_sync (guestfs_h *g, int proc_nr,
    * free the buffer anyway?
    */
   if (g->msg_out != NULL) {
-    error (g, "guestfs__send_sync: msg_out should be NULL");
+    error (g, _("guestfs__send_sync: msg_out should be NULL"));
     return -1;
   }
 
@@ -1594,7 +2007,7 @@ guestfs__send_sync (guestfs_h *g, int proc_nr,
   hdr.status = GUESTFS_STATUS_OK;
 
   if (!xdr_guestfs_message_header (&xdr, &hdr)) {
-    error (g, "xdr_guestfs_message_header failed");
+    error (g, _("xdr_guestfs_message_header failed"));
     goto cleanup1;
   }
 
@@ -1603,7 +2016,7 @@ guestfs__send_sync (guestfs_h *g, int proc_nr,
    */
   if (xdrp) {
     if (!(*xdrp) (&xdr, args)) {
-      error (g, "dispatch failed to marshal args");
+      error (g, _("dispatch failed to marshal args"));
       goto cleanup1;
     }
   }
@@ -1629,7 +2042,7 @@ guestfs__send_sync (guestfs_h *g, int proc_nr,
   if (ml->main_loop_run (ml, g) == -1)
     goto cleanup1;
   if (sent != 1) {
-    error (g, "send failed, see earlier error messages");
+    error (g, _("send failed, see earlier error messages"));
     goto cleanup1;
   }
 
@@ -1744,7 +2157,7 @@ send_file_chunk_sync (guestfs_h *g, int cancel, const char *buf, size_t buflen)
   guestfs_main_loop *ml = guestfs_get_main_loop (g);
 
   if (g->state != BUSY) {
-    error (g, "send_file_chunk_sync: state %d != READY", g->state);
+    error (g, _("send_file_chunk_sync: state %d != READY"), g->state);
     return -1;
   }
 
@@ -1752,7 +2165,7 @@ send_file_chunk_sync (guestfs_h *g, int cancel, const char *buf, size_t buflen)
    * free the buffer anyway?
    */
   if (g->msg_out != NULL) {
-    error (g, "guestfs__send_sync: msg_out should be NULL");
+    error (g, _("guestfs__send_sync: msg_out should be NULL"));
     return -1;
   }
 
@@ -1775,7 +2188,7 @@ send_file_chunk_sync (guestfs_h *g, int cancel, const char *buf, size_t buflen)
   chunk.data.data_val = (char *) buf;
 
   if (!xdr_guestfs_chunk (&xdr, &chunk)) {
-    error (g, "xdr_guestfs_chunk failed (buf = %p, buflen = %zu)",
+    error (g, _("xdr_guestfs_chunk failed (buf = %p, buflen = %zu)"),
 	   buf, buflen);
     xdr_destroy (&xdr);
     goto cleanup1;
@@ -1800,7 +2213,7 @@ send_file_chunk_sync (guestfs_h *g, int cancel, const char *buf, size_t buflen)
   if (ml->main_loop_run (ml, g) == -1)
     goto cleanup1;
   if (sent != 1) {
-    error (g, "send file chunk failed, see earlier error messages");
+    error (g, _("send file chunk failed, see earlier error messages"));
     goto cleanup1;
   }
 
@@ -1851,7 +2264,7 @@ check_for_daemon_cancellation (guestfs_h *g)
   xdr_destroy (&xdr);
 
   if (flag != GUESTFS_CANCEL_FLAG) {
-    error (g, "check_for_daemon_cancellation: read 0x%x from daemon, expected 0x%x\n",
+    error (g, _("check_for_daemon_cancellation: read 0x%x from daemon, expected 0x%x\n"),
 	   flag, GUESTFS_CANCEL_FLAG);
     return 0;
   }
@@ -1889,7 +2302,7 @@ guestfs__receive_file_sync (guestfs_h *g, const char *filename)
   }
 
   if (r == -1) {
-    error (g, "%s: error in chunked encoding", filename);
+    error (g, _("%s: error in chunked encoding"), filename);
     return -1;
   }
 
@@ -1908,12 +2321,16 @@ guestfs__receive_file_sync (guestfs_h *g, const char *filename)
   char fbuf[4];
   uint32_t flag = GUESTFS_CANCEL_FLAG;
 
+  if (g->verbose)
+    fprintf (stderr, "%s: waiting for daemon to acknowledge cancellation\n",
+	     __func__);
+
   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");
+    perrorf (g, _("write to daemon socket"));
     return -1;
   }
 
@@ -1960,7 +2377,7 @@ receive_file_cb (guestfs_h *g, void *data, XDR *xdr)
   memset (&chunk, 0, sizeof chunk);
 
   if (!xdr_guestfs_chunk (xdr, &chunk)) {
-    error (g, "failed to parse file chunk");
+    error (g, _("failed to parse file chunk"));
     free_chunks (ctx);
     ctx->chunks = NULL;
     ctx->count = -1;
@@ -1992,12 +2409,12 @@ receive_file_data_sync (guestfs_h *g, void **buf, size_t *len_r)
   guestfs_set_reply_callback (g, NULL, NULL);
 
   if (ctx.count == 0) {
-    error (g, "receive_file_data_sync: reply callback not called\n");
+    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");
+    error (g, _("receive_file_data_sync: parse error in reply callback\n"));
     /* callback already freed the chunks */
     return -1;
   }
@@ -2011,7 +2428,7 @@ receive_file_data_sync (guestfs_h *g, void **buf, size_t *len_r)
 
   for (i = 0; i < ctx.count; ++i) {
     if (ctx.chunks[i].cancel) {
-      error (g, "file receive cancelled by daemon");
+      error (g, _("file receive cancelled by daemon"));
       free_chunks (&ctx);
       if (buf) free (*buf);
       if (len_r) *len_r = 0;
@@ -2046,7 +2463,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;
   }
 
@@ -2054,24 +2471,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;
   }
 
@@ -2104,14 +2521,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;
   }
 
@@ -2160,7 +2577,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;
   }