X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=rescue%2Fvirt-rescue.c;h=7ad39b5b65a96e347e57ffeae875f0887a13d98c;hb=040b6cb061e510992c2b8f1ab97289f55c363ba2;hp=f129b1c8e5e7d52ba217bb28d8b1cbb535a4f9ac;hpb=b8e1dee73a1deef1bfd5937e2abfbe9afef7b1ef;p=libguestfs.git

diff --git a/rescue/virt-rescue.c b/rescue/virt-rescue.c
index f129b1c..7ad39b5 100644
--- a/rescue/virt-rescue.c
+++ b/rescue/virt-rescue.c
@@ -1,5 +1,5 @@
 /* virt-rescue
- * Copyright (C) 2010 Red Hat Inc.
+ * Copyright (C) 2010-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,13 +20,16 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <errno.h>
 #include <locale.h>
 #include <assert.h>
+#include <libintl.h>
 
+#include "ignore-value.h"
 #include "progname.h"
 #include "xvasprintf.h"
 
@@ -74,6 +77,7 @@ usage (int status)
              "  --network            Enable network\n"
              "  -r|--ro              Access read-only\n"
              "  --selinux            Enable SELinux\n"
+             "  --smp N              Enable SMP with N >= 2 virtual CPUs\n"
              "  -v|--verbose         Verbose messages\n"
              "  -V|--version         Display version and exit\n"
              "  -w|--rw              Mount read-write\n"
@@ -112,6 +116,7 @@ main (int argc, char *argv[])
     { "ro", 0, 0, 'r' },
     { "rw", 0, 0, 'w' },
     { "selinux", 0, 0, 0 },
+    { "smp", 1, 0, 0 },
     { "verbose", 0, 0, 'v' },
     { "version", 0, 0, 'V' },
     { 0, 0, 0, 0 }
@@ -125,6 +130,7 @@ main (int argc, char *argv[])
   const char *append = NULL;
   char *append_full;
   int memsize = 0;
+  int smp = 0;
 
   g = guestfs_create ();
   if (g == NULL) {
@@ -151,6 +157,17 @@ main (int argc, char *argv[])
           format = NULL;
         else
           format = optarg;
+      } else if (STREQ (long_options[option_index].name, "smp")) {
+        if (sscanf (optarg, "%u", &smp) != 1) {
+          fprintf (stderr, _("%s: could not parse --smp parameter '%s'\n"),
+                   program_name, optarg);
+          exit (EXIT_FAILURE);
+        }
+        if (smp < 1) {
+          fprintf (stderr, _("%s: --smp parameter '%s' should be >= 1\n"),
+                   program_name, optarg);
+          exit (EXIT_FAILURE);
+        }
       } else {
         fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),
                  program_name, long_options[option_index].name, option_index);
@@ -267,6 +284,8 @@ main (int argc, char *argv[])
     guestfs_set_memsize (g, memsize);
   if (network)
     guestfs_set_network (g, 1);
+  if (smp >= 1)
+    guestfs_set_smp (g, smp);
 
   /* Kernel command line must include guestfs_rescue=1 (see
    * appliance/init) as well as other options.
@@ -287,17 +306,9 @@ main (int argc, char *argv[])
    * appliance.
    */
   guestfs_set_error_handler (g, NULL, NULL);
-  guestfs_launch (g);
 
-  /* launch() expects guestfsd to start. However, virt-rescue doesn't
-   * run guestfsd, so this will always fail with ECHILD when the
-   * appliance exits unexpectedly.
-   */
-  if (errno != ECHILD) {
-    fprintf (stderr, "%s: %s\n", program_name, guestfs_last_error (g));
-    guestfs_close (g);
-    exit (EXIT_FAILURE);
-  }
+  /* We expect launch to fail, so ignore the return value. */
+  ignore_value (guestfs_launch (g));
 
   guestfs_close (g);