diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-10-05 18:49:01 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-10-05 18:49:01 +0200 |
| commit | d452b4872652f0955675438d7621a5411cbdbf9b (patch) | |
| tree | 6a60c66253aa6e13861077a610b01299d699d32f /sysemu.h | |
| parent | Merge commit '0cb892aa268c31a4b082a83e46b422332ea28244' into upstream-merge (diff) | |
| parent | Enable host-clock-based RTC (diff) | |
| download | qemu-kvm-d452b4872652f0955675438d7621a5411cbdbf9b.tar.gz qemu-kvm-d452b4872652f0955675438d7621a5411cbdbf9b.tar.bz2 qemu-kvm-d452b4872652f0955675438d7621a5411cbdbf9b.zip | |
Merge commit '6875204c782e7c9aa5c28f96b2583fd31c50468f' into upstream-merge
* commit '6875204c782e7c9aa5c28f96b2583fd31c50468f':
Enable host-clock-based RTC
Refactor RTC command line switches
Introduce QEMU_CLOCK_HOST
win32: Drop dead dyntick timer code
Rename QEMU_TIMER_* to QEMU_CLOCK_*
Fix exit on 'pci_add' Monitor command
Correctly free nd structure
do proper cpu_self check
bdf: Remove last users of FALSE/TRUE
Add -Wold-style-* flags
slirp: It needs to use QEMU_CFLAGS not CFLAGS
musicpal: Add VMState support
musicpal: Make PIT emulation more robust
musicpal: True reset support for audio device
musicpal: True reset support for GPIO
musicpal: Coding style fixes
musicpal: Clean up typecasts
musicpal: Rework GPIO input events
musicpal: Catch null TX qeueues
Conflicts:
sysemu.h
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -5,6 +5,7 @@ #include "qemu-common.h" #include "qemu-option.h" #include "qemu-queue.h" +#include "qemu-timer.h" #include "qdict.h" #ifdef _WIN32 @@ -135,6 +136,7 @@ extern int no_quit; extern int semihosting_enabled; extern int old_param; extern int boot_menu; +extern QEMUClock *rtc_clock; extern long hpagesize; #define MAX_NODES 64 |