mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
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
This commit is contained in:
commit
b7c8e15a14
7 changed files with 83 additions and 56 deletions
2
vl.c
2
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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue