diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-15 17:56:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-15 17:56:14 +0000 |
| commit | 4caecccbc13b23c1e7344046f6d0c346be6297a3 (patch) | |
| tree | 6f19bd16f31096206358078e9d0d933117d3bbd2 /include/qemu/timer.h | |
| parent | a6cdb77f816961f929d7934643febd2852230135 (diff) | |
| parent | e76d1798faa6d29f54c0930a034b67f3ecdb947d (diff) | |
| download | focaccia-qemu-4caecccbc13b23c1e7344046f6d0c346be6297a3.tar.gz focaccia-qemu-4caecccbc13b23c1e7344046f6d0c346be6297a3.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Miscellaneous exec.c fixes (Markus, myself) * Q35 support for -machine kernel_irqchip=split (Rita) * Chardev replay support (Pavel) * icount "warping" cleanups (Pavel) # gpg: Signature made Tue 15 Mar 2016 17:24:08 GMT using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" * remotes/bonzini/tags/for-upstream: icount: decouple warp calls icount: remove obsolete warp call replay: character devices exec: fix early return from ram_block_add exec: Fix memory allocation when memory path isn't on hugetlbfs exec: Fix memory allocation when memory path names new file update-linux-headers: Add userfaultfd.h kvm: x86: q35: Add support for -machine kernel_irqchip=split for q35 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/timer.h')
| -rw-r--r-- | include/qemu/timer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index d0946cb953..7197d0859a 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -210,12 +210,11 @@ void qemu_clock_notify(QEMUClockType type); void qemu_clock_enable(QEMUClockType type, bool enabled); /** - * qemu_clock_warp: - * @type: the clock type + * qemu_start_warp_timer: * - * Warp a clock to a new value + * Starts a timer for virtual clock update */ -void qemu_clock_warp(QEMUClockType type); +void qemu_start_warp_timer(void); /** * qemu_clock_register_reset_notifier: |