X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fguestfs.c;h=9560aec02f1092cbf4f47d410ad961b037935cc9;hb=5b3452e99992ffb2cee7e6353243b553cdc74a46;hp=edff8eb5cb9114815e64359890b8088b68654a2b;hpb=fbb3482a48b46f2ae51fb7600926fc04dc2c5ef1;p=libguestfs.git

diff --git a/src/guestfs.c b/src/guestfs.c
index edff8eb..9560aec 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -866,6 +866,7 @@ dir_contains_files (const char *dir, ...)
 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 void print_cmdline (guestfs_h *g);
 
 static const char *kernel_name = "vmlinuz." REPO "." host_cpu;
 static const char *initrd_name = "initramfs." REPO "." host_cpu ".img";
@@ -879,7 +880,7 @@ guestfs_launch (guestfs_h *g)
 {
   const char *tmpdir;
   char dir_template[PATH_MAX];
-  int r, i, pmore;
+  int r, pmore;
   size_t len;
   int wfd[2], rfd[2];
   int tries;
@@ -1103,7 +1104,7 @@ guestfs_launch (guestfs_h *g)
     }
 #endif
     add_cmdline (g, "-net");
-    add_cmdline (g, "nic,model=virtio,vlan=0");
+    add_cmdline (g, "nic,model=" NET_IF ",vlan=0");
 
     /* These options recommended by KVM developers to improve reliability. */
     if (qemu_supports (g, "-no-hpet"))
@@ -1116,12 +1117,8 @@ guestfs_launch (guestfs_h *g)
     incr_cmdline_size (g);
     g->cmdline[g->cmdline_size-1] = NULL;
 
-    if (g->verbose) {
-      fprintf (stderr, "%s", g->qemu);
-      for (i = 0; g->cmdline[i]; ++i)
-        fprintf (stderr, " %s", g->cmdline[i]);
-      fprintf (stderr, "\n");
-    }
+    if (g->verbose)
+      print_cmdline (g);
 
     /* Set up stdin, stdout. */
     close (0);
@@ -1301,6 +1298,33 @@ guestfs_launch (guestfs_h *g)
   return -1;
 }
 
+/* This function is used to print the qemu command line before it gets
+ * executed, when in verbose mode.
+ */
+static void
+print_cmdline (guestfs_h *g)
+{
+  int i = 0;
+  int needs_quote;
+
+  while (g->cmdline[i]) {
+    if (g->cmdline[i][0] == '-') /* -option starts a new line */
+      fprintf (stderr, " \\\n   ");
+
+    if (i > 0) fputc (' ', stderr);
+
+    /* Does it need shell quoting?  This only deals with simple cases. */
+    needs_quote = strcspn (g->cmdline[i], " ") != strlen (g->cmdline[i]);
+
+    if (needs_quote) fputc ('\'', stderr);
+    fprintf (stderr, "%s", g->cmdline[i]);
+    if (needs_quote) fputc ('\'', stderr);
+    i++;
+  }
+
+  fputc ('\n', stderr);
+}
+
 /* 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