diff options
| author |   Daniel Gollub <gollub@b1-systems.de> | 2009-09-10 01:10:20 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-09-10 12:43:23 +0300 |
| commit | a9e0cea0c68f8fc388c5bbd918615017e0274f03 (patch) | |
| tree | 06573949204f0c77e346ab25134874265d406e69 /qemu-kvm.h | |
| parent | Merge branch 'upstream-merge' (diff) | |
| download | qemu-kvm-a9e0cea0c68f8fc388c5bbd918615017e0274f03.tar.gz qemu-kvm-a9e0cea0c68f8fc388c5bbd918615017e0274f03.tar.bz2 qemu-kvm-a9e0cea0c68f8fc388c5bbd918615017e0274f03.zip | |
Fix --disable-kvm build regression due to mp_state
qemu-kvm --disable-kvm build regression of commit 8c7d4cb spotted by
qemu-kvm buildbot:
/var/lib/buildbot/qemu-kvm/disable_kvm_i386_debian_5_0/build/qemu-kvm.h: In function 'kvm_arch_get_registers':
/var/lib/buildbot/qemu-kvm/disable_kvm_i386_debian_5_0/build/qemu-kvm.h:1160: error: 'KVM_MP_STATE_HALTED' undeclared (first use in this function)
/var/lib/buildbot/qemu-kvm/disable_kvm_i386_debian_5_0/build/qemu-kvm.h:1160: error: (Each undeclared identifier is reported only once
/var/lib/buildbot/qemu-kvm/disable_kvm_i386_debian_5_0/build/qemu-kvm.h:1160: error: for each function it appears in.)
make[1]: *** [vl.o] Error 1
Signed-off-by: Daniel Gollub <gollub@b1-systems.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.h')
| -rw-r--r-- | qemu-kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-kvm.h b/qemu-kvm.h index 4be6afd83..11350f731 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -1157,7 +1157,9 @@ static inline void kvm_arch_get_registers(CPUState *env) { kvm_arch_save_regs(env); kvm_arch_save_mpstate(env); +#ifdef KVM_CAP_MP_STATE env->halted = (env->mp_state == KVM_MP_STATE_HALTED); +#endif } static inline void kvm_arch_put_registers(CPUState *env) |