diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-23 11:52:55 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-23 11:52:55 -0500 |
| commit | 2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d (patch) | |
| tree | 506ea140053974266577f7563998d7173cd5905d /hw/i386/kvm/clock.c | |
| parent | 3e4be9c29784df09c364b52a55e826a0b05b950e (diff) | |
| parent | 7a1c0d200f3ca5be48f7034c6ed5458e490f8816 (diff) | |
| download | qemu-2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d.zip | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (8) and others
# Via Michael Tokarev
* mjt/trivial-patches:
tests/.gitignore: ignore test-throttle
exec: Fix broken build for MinGW (regression)
kvm: Fix compiler warning (clang)
tcg-sparc: Fix parenthesis warning
Makefile: Remove some more files when cleaning
target-i386: Fix segment cache dump
iov: avoid "orig_len may be used unitialized" warning
vscclient: remove unnecessary use of uninitialized variable
trace-events: Clean up with scripts/cleanup-trace-events.pl again
tci: Fix qemu-alpha on 32 bit hosts (wrong assertions)
*-user: Improve documentation for lock_user function
MAINTAINERS: Add missing entry to filelist for TCI target
translate-all: Fix formatting of dump output
*-user: Fix typo in comment (ulocking -> unlocking)
docs: Fix IO port number for CPU present bitmap.
q35: Fix typo in constant DEFUALT -> DEFAULT.
configure: Undefine _FORTIFY_SOURCE prior using it
Message-id: 1379696296-32105-1-git-send-email-mjt@msgid.tls.msk.ru
Diffstat (limited to 'hw/i386/kvm/clock.c')
| -rw-r--r-- | hw/i386/kvm/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 92aabb83b5..383938d1bc 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -39,7 +39,7 @@ static void kvmclock_vm_state_change(void *opaque, int running, RunState state) { KVMClockState *s = opaque; - CPUState *cpu = first_cpu; + CPUState *cpu; int cap_clock_ctrl = kvm_check_extension(kvm_state, KVM_CAP_KVMCLOCK_CTRL); int ret; |