summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-04-27 11:05:08 -0400
committerRichard W.M. Jones <rjones@redhat.com>2012-05-12 16:59:48 +0100
commit5c5979084536b8d03cd7cc37dd5a8a7a0b01fe56 (patch)
tree997d2f739a92c3224310c830774941dfc645d1cf /src
parenta3718c6b8be9bcbfd1e753c699f030d1852bc26e (diff)
downloadlibguestfs-5c5979084536b8d03cd7cc37dd5a8a7a0b01fe56.tar.gz
libguestfs-5c5979084536b8d03cd7cc37dd5a8a7a0b01fe56.tar.xz
libguestfs-5c5979084536b8d03cd7cc37dd5a8a7a0b01fe56.zip
arm: Disable test for -no-hpet during launch.
Diffstat (limited to 'src')
-rw-r--r--src/launch.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/launch.c b/src/launch.c
index c66cbacc..6332a3df 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -662,8 +662,16 @@ launch_appliance (guestfs_h *g)
add_cmdline (g, "-no-reboot");
/* These options recommended by KVM developers to improve reliability. */
+#ifndef __arm__
+ /* qemu-system-arm advertises the -no-hpet option but if you try
+ * to use it, it usefully says:
+ * "Option no-hpet not supported for this target".
+ * Cheers qemu developers. How many years have we been asking for
+ * capabilities? Could be 3 or 4 years, I forget.
+ */
if (qemu_supports (g, "-no-hpet"))
add_cmdline (g, "-no-hpet");
+#endif
if (qemu_supports (g, "-rtc-td-hack"))
add_cmdline (g, "-rtc-td-hack");