diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2009-07-21 13:34:46 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2009-07-21 13:34:46 +0100 |
| commit | 83458d26fafd027f5c5c18208b4937cbde6e5ad7 (patch) | |
| tree | 82fe955d75406013b2d1e02a12c46b51ea0c8897 /src/guestfs.c | |
| parent | 000f54aac80191b42e0c307440d09fafd4d5fac2 (diff) | |
| download | libguestfs-83458d26fafd027f5c5c18208b4937cbde6e5ad7.tar.gz libguestfs-83458d26fafd027f5c5c18208b4937cbde6e5ad7.tar.xz libguestfs-83458d26fafd027f5c5c18208b4937cbde6e5ad7.zip | |
Library: Pass more options on the Linux kernel command line.
Always pass:
noapic (APIC causes problems for lots of people)
udevtimeout=300 (for very slow qemu using softemu)
acpi=off (ACPI is troublesome and unnecessary, so turn it off)
Diffstat (limited to 'src/guestfs.c')
| -rw-r--r-- | src/guestfs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/guestfs.c b/src/guestfs.c index 386dee6c..fa8a5fc3 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -1043,9 +1043,16 @@ guestfs_launch (guestfs_h *g) "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%s%s", + LINUX_CMDLINE "guestfs=%s:%d%s%s%s", VMCHANNEL_ADDR, VMCHANNEL_PORT, g->verbose ? " guestfs_verbose=1" : "", g->append ? " " : "", g->append ? g->append : ""); |