summaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2012-03-31 12:10:07 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-03-31 12:10:07 +0000
commitb7c8e15a146a7b20021b524f41d6b8072ee093b5 (patch)
tree538bf55b7f6533f38d0f54ef2e88ffe60f966311 /qemu-options.hx
parent4dec4654604e7e52964ff0201c46d85d179ed35f (diff)
parentb0f26631bc51790069b0c0b3935b20f9a54e3ab3 (diff)
downloadqemu-b7c8e15a146a7b20021b524f41d6b8072ee093b5.tar.gz
Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm: pl031: switch clock base to rtc_clock pl031: rearm alarm timer upon load arm: switch real-time clocks to rtc_clock omap: switch omap_lpg to vm_clock rtc: add -rtc clock=rt
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx7
1 files changed, 4 insertions, 3 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index fe88939805..f72f9a0fdf 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2453,7 +2453,7 @@ DEF("localtime", 0, QEMU_OPTION_localtime, "", QEMU_ARCH_ALL)
DEF("startdate", HAS_ARG, QEMU_OPTION_startdate, "", QEMU_ARCH_ALL)
DEF("rtc", HAS_ARG, QEMU_OPTION_rtc, \
- "-rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew]\n" \
+ "-rtc [base=utc|localtime|date][,clock=host|rt|vm][,driftfix=none|slew]\n" \
" set the RTC base and clock, enable drift fix for clock ticks (x86 only)\n",
QEMU_ARCH_ALL)
@@ -2469,8 +2469,9 @@ format @code{2006-06-17T16:01:21} or @code{2006-06-17}. The default base is UTC.
By default the RTC is driven by the host system time. This allows to use the
RTC as accurate reference clock inside the guest, specifically if the host
time is smoothly following an accurate external reference clock, e.g. via NTP.
-If you want to isolate the guest time from the host, even prevent it from
-progressing during suspension, you can set @option{clock} to @code{vm} instead.
+If you want to isolate the guest time from the host, you can set @option{clock}
+to @code{rt} instead. To even prevent it from progressing during suspension,
+you can set it to @code{vm}.
Enable @option{driftfix} (i386 targets only) if you experience time drift problems,
specifically with Windows' ACPI HAL. This option will try to figure out how