X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Flaunch.c;h=b0f5b39411e7f2b1eabd3da29afb934eb7ee9c10;hb=293772bf7511dee41a1f3e842424678c1a6bf9e4;hp=515ccd56be673a6f2d52b5acdf2f21e12db915da;hpb=79e66f89e2f6c27486476d7857da58feb491bf5c;p=libguestfs.git

diff --git a/src/launch.c b/src/launch.c
index 515ccd5..b0f5b39 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -555,6 +555,12 @@ launch_appliance (guestfs_h *g)
 
     add_cmdline (g, "-nographic");
 
+    if (g->smp > 1) {
+      snprintf (buf, sizeof buf, "%d", g->smp);
+      add_cmdline (g, "-smp");
+      add_cmdline (g, buf);
+    }
+
     snprintf (buf, sizeof buf, "%d", g->memsize);
     add_cmdline (g, "-m");
     add_cmdline (g, buf);
@@ -606,6 +612,7 @@ launch_appliance (guestfs_h *g)
     "panic=1 "         /* force kernel to panic if daemon exits */	\
     "console=ttyS0 "   /* serial console */				\
     "udevtimeout=300 " /* good for very slow systems (RHBZ#480319) */	\
+    "no_timer_check "  /* fix for RHBZ#502058 */                        \
     "acpi=off "        /* we don't need ACPI, turn it off */		\
     "printk.time=1 "   /* display timestamp before kernel messages */   \
     "cgroup_disable=memory " /* saves us about 5 MB of RAM */