X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs.c;h=e10463309bf625fae4b91d3903a82cf96da3ee2a;hp=747aae50453133d279c9e6088f154e2f2ee61d11;hb=b3f11c5f62f725fa3f09452b38d52dba764f80d0;hpb=c9cc61940b41b1abb763a1932adfc3461372c10b

diff --git a/src/guestfs.c b/src/guestfs.c
index 747aae5..e104633 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -19,7 +19,7 @@
 #include <config.h>
 
 #define _BSD_SOURCE /* for mkdtemp, usleep */
-#define _GNU_SOURCE /* for vasprintf, GNU strerror_r */
+#define _GNU_SOURCE /* for vasprintf, GNU strerror_r, strchrnul */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,9 +58,10 @@
 
 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, int nbytes);
+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);
 
 static void default_error_cb (guestfs_h *g, void *data, const char *msg);
 static void stdout_event (void *data, int watch, int fd, int events);
@@ -118,6 +119,10 @@ struct guestfs_h
   int verbose;
   int autosync;
 
+  const char *path;
+
+  char *last_error;
+
   /* Callbacks. */
   guestfs_abort_cb           abort_cb;
   guestfs_error_handler_cb   error_cb;
@@ -178,6 +183,10 @@ guestfs_create (void)
   str = getenv ("LIBGUESTFS_DEBUG");
   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. */
+
   /* Start with large serial numbers so they are easy to spot
    * inside the protocol.
    */
@@ -257,6 +266,7 @@ guestfs_close (guestfs_h *g)
   }
   /* release mutex (XXX) */
 
+  free (g->last_error);
   free (g);
 }
 
@@ -267,6 +277,19 @@ close_handles (void)
   while (handles) guestfs_close (handles);
 }
 
+const char *
+guestfs_last_error (guestfs_h *g)
+{
+  return g->last_error;
+}
+
+static void
+set_last_error (guestfs_h *g, const char *msg)
+{
+  free (g->last_error);
+  g->last_error = strdup (msg);
+}
+
 static void
 default_error_cb (guestfs_h *g, void *data, const char *msg)
 {
@@ -279,13 +302,12 @@ error (guestfs_h *g, const char *fs, ...)
   va_list args;
   char *msg;
 
-  if (!g->error_cb) return;
-
   va_start (args, fs);
   vasprintf (&msg, fs, args);
   va_end (args);
 
-  g->error_cb (g, g->error_cb_data, msg);
+  if (g->error_cb) g->error_cb (g, g->error_cb_data, msg);
+  set_last_error (g, msg);
 
   free (msg);
 }
@@ -297,8 +319,6 @@ perrorf (guestfs_h *g, const char *fs, ...)
   char *msg;
   int err = errno;
 
-  if (!g->error_cb) return;
-
   va_start (args, fs);
   vasprintf (&msg, fs, args);
   va_end (args);
@@ -316,13 +336,14 @@ perrorf (guestfs_h *g, const char *fs, ...)
   strcat (msg, ": ");
   strcat (msg, buf);
 
-  g->error_cb (g, g->error_cb_data, msg);
+  if (g->error_cb) g->error_cb (g, g->error_cb_data, msg);
+  set_last_error (g, msg);
 
   free (msg);
 }
 
 static void *
-safe_malloc (guestfs_h *g, int nbytes)
+safe_malloc (guestfs_h *g, size_t nbytes)
 {
   void *ptr = malloc (nbytes);
   if (!ptr) g->abort_cb ();
@@ -345,6 +366,15 @@ safe_strdup (guestfs_h *g, const char *str)
   return s;
 }
 
+static void *
+safe_memdup (guestfs_h *g, void *ptr, size_t size)
+{
+  void *p = malloc (size);
+  if (!p) g->abort_cb ();
+  memcpy (p, ptr, size);
+  return p;
+}
+
 void
 guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb cb)
 {
@@ -371,10 +401,11 @@ guestfs_get_error_handler (guestfs_h *g, void **data_rtn)
   return g->error_cb;
 }
 
-void
+int
 guestfs_set_verbose (guestfs_h *g, int v)
 {
-  g->verbose = v;
+  g->verbose = !!v;
+  return 0;
 }
 
 int
@@ -383,10 +414,11 @@ guestfs_get_verbose (guestfs_h *g)
   return g->verbose;
 }
 
-void
+int
 guestfs_set_autosync (guestfs_h *g, int a)
 {
-  g->autosync = a;
+  g->autosync = !!a;
+  return 0;
 }
 
 int
@@ -395,6 +427,22 @@ guestfs_get_autosync (guestfs_h *g)
   return g->autosync;
 }
 
+int
+guestfs_set_path (guestfs_h *g, const char *path)
+{
+  if (path == NULL)
+    g->path = GUESTFS_DEFAULT_PATH;
+  else
+    g->path = path;
+  return 0;
+}
+
+const char *
+guestfs_get_path (guestfs_h *g)
+{
+  return g->path;
+}
+
 /* Add a string to the current command line. */
 static void
 incr_cmdline_size (guestfs_h *g)
@@ -467,6 +515,11 @@ guestfs_add_drive (guestfs_h *g, const char *filename)
     return -1;
   }
 
+  if (access (filename, F_OK) == -1) {
+    perrorf (g, "%s", filename);
+    return -1;
+  }
+
   snprintf (buf, len, "file=%s", filename);
 
   return guestfs_config (g, "-drive", buf);
@@ -480,6 +533,11 @@ guestfs_add_cdrom (guestfs_h *g, const char *filename)
     return -1;
   }
 
+  if (access (filename, F_OK) == -1) {
+    perrorf (g, "%s", filename);
+    return -1;
+  }
+
   return guestfs_config (g, "-cdrom", filename);
 }
 
@@ -487,19 +545,16 @@ int
 guestfs_launch (guestfs_h *g)
 {
   static const char *dir_template = "/tmp/libguestfsXXXXXX";
-  int r, i;
+  int r, i, len, pmore;
   int wfd[2], rfd[2];
   int tries;
-  /*const char *qemu = QEMU;*/	/* XXX */
-  const char *qemu = "/usr/bin/qemu-system-x86_64";
-  const char *kernel = "vmlinuz.fedora-10.x86_64";
-  const char *initrd = "initramfs.fedora-10.x86_64.img";
+  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;
 
-  /* XXX Choose which qemu to run. */
-  /* XXX Choose initrd, etc. */
-
   /* Configured? */
   if (!g->cmdline) {
     error (g, "you must call guestfs_add_drive before guestfs_launch");
@@ -511,12 +566,59 @@ guestfs_launch (guestfs_h *g)
     return -1;
   }
 
+  /* 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 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);
+	break;
+      }
+    }
+    /* Look at <path>/kernel 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);
+
+      if (access (kernel, F_OK) == 0 && access (initrd, F_OK) == 0)
+	break;
+      free (kernel);
+      free (initrd);
+      kernel = initrd = NULL;
+    }
+
+    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);
-      return -1;
+      goto cleanup0;
     }
   }
 
@@ -525,7 +627,7 @@ guestfs_launch (guestfs_h *g)
 
   if (pipe (wfd) == -1 || pipe (rfd) == -1) {
     perrorf (g, "pipe");
-    return -1;
+    goto cleanup0;
   }
 
   r = fork ();
@@ -535,7 +637,7 @@ guestfs_launch (guestfs_h *g)
     close (wfd[1]);
     close (rfd[0]);
     close (rfd[1]);
-    return -1;
+    goto cleanup0;
   }
 
   if (r == 0) {			/* Child (qemu). */
@@ -545,7 +647,7 @@ 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 *) qemu;
+    g->cmdline[0] = (char *) QEMU;
 
     /* Construct the -net channel parameter for qemu. */
     snprintf (vmchannel, sizeof vmchannel,
@@ -578,7 +680,7 @@ guestfs_launch (guestfs_h *g)
     g->cmdline[g->cmdline_size-1] = NULL;
 
     if (g->verbose) {
-      fprintf (stderr, "%s", qemu);
+      fprintf (stderr, "%s", QEMU);
       for (i = 0; g->cmdline[i]; ++i)
 	fprintf (stderr, " %s", g->cmdline[i]);
       fprintf (stderr, "\n");
@@ -601,8 +703,8 @@ guestfs_launch (guestfs_h *g)
     setpgid (0, 0);
 #endif
 
-    execv (qemu, g->cmdline);	/* Run qemu. */
-    perror (qemu);
+    execv (QEMU, g->cmdline);	/* Run qemu. */
+    perror (QEMU);
     _exit (1);
   }
 
@@ -719,6 +821,10 @@ guestfs_launch (guestfs_h *g)
   g->start_t = 0;
   g->stdout_watch = -1;
   g->sock_watch = -1;
+
+ cleanup0:
+  free (kernel);
+  free (initrd);
   return -1;
 }
 
@@ -779,7 +885,7 @@ guestfs_kill_subprocess (guestfs_h *g)
   }
 
   if (g->verbose)
-    fprintf (stderr, "sending SIGTERM to process group %d\n", g->pid);
+    fprintf (stderr, "sending SIGTERM to process %d\n", g->pid);
 
   kill (g->pid, SIGTERM);
 
@@ -940,6 +1046,28 @@ sock_read_event (void *data, int watch, int fd, int events)
     goto cleanup;
   }
 
+  /* Got the full message, begin processing it. */
+  if (g->verbose) {
+    int i, j;
+
+    for (i = 0; i < g->msg_in_size; i += 16) {
+      printf ("%04x: ", i);
+      for (j = i; j < MIN (i+16, g->msg_in_size); ++j)
+	printf ("%02x ", (unsigned char) g->msg_in[j]);
+      for (; j < i+16; ++j)
+	printf ("   ");
+      printf ("|");
+      for (j = i; j < MIN (i+16, g->msg_in_size); ++j)
+	if (isprint (g->msg_in[j]))
+	  printf ("%c", g->msg_in[j]);
+	else
+	  printf (".");
+      for (; j < i+16; ++j)
+	printf (" ");
+      printf ("|\n");
+    }
+  }
+
   /* Not in the expected state. */
   if (g->state != BUSY)
     error (g, "state %d != BUSY", g->state);
@@ -1152,6 +1280,37 @@ check_reply_header (guestfs_h *g,
  */
 #include "guestfs-actions.c"
 
+/* Structure-freeing functions.  These rely on the fact that the
+ * structure format is identical to the XDR format.  See note in
+ * generator.ml.
+ */
+void
+guestfs_free_int_bool (struct guestfs_int_bool *x)
+{
+  free (x);
+}
+
+void
+guestfs_free_lvm_pv_list (struct guestfs_lvm_pv_list *x)
+{
+  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_pv_list, (char *) x);
+  free (x);
+}
+
+void
+guestfs_free_lvm_vg_list (struct guestfs_lvm_vg_list *x)
+{
+  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_vg_list, (char *) x);
+  free (x);
+}
+
+void
+guestfs_free_lvm_lv_list (struct guestfs_lvm_lv_list *x)
+{
+  xdr_free ((xdrproc_t) xdr_guestfs_lvm_int_lv_list, (char *) x);
+  free (x);
+}
+
 /* This is the default main loop implementation, using select(2). */
 
 struct handle_cb_data {