aboutsummaryrefslogtreecommitdiff
path: root/vl.c
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 /vl.c
parent4dec4654604e7e52964ff0201c46d85d179ed35f (diff)
parentb0f26631bc51790069b0c0b3935b20f9a54e3ab3 (diff)
downloadqemu-b7c8e15a146a7b20021b524f41d6b8072ee093b5.zip
qemu-b7c8e15a146a7b20021b524f41d6b8072ee093b5.tar.gz
qemu-b7c8e15a146a7b20021b524f41d6b8072ee093b5.tar.bz2
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 'vl.c')
-rw-r--r--vl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index e575401..ae91a8a 100644
--- a/vl.c
+++ b/vl.c
@@ -530,6 +530,8 @@ static void configure_rtc(QemuOpts *opts)
if (value) {
if (!strcmp(value, "host")) {
rtc_clock = host_clock;
+ } else if (!strcmp(value, "rt")) {
+ rtc_clock = rt_clock;
} else if (!strcmp(value, "vm")) {
rtc_clock = vm_clock;
} else {