From: Daniel Gollub Subject: [PATCH] Fix --disable-kvm build regression of commit 8c7d4cb Date: Thu, 10 Sep 2009 01:10:20 +0200 Message-ID: <200909100110.20894.gollub@b1-systems.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org, Gleb Natapov To: avi@redhat.com Return-path: Received: from d112a2.x-mailer.de ([212.162.53.4]:41125 "EHLO d112a2.x-mailer.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645AbZIIXIZ convert rfc822-to-8bit (ORCPT ); Wed, 9 Sep 2009 19:08:25 -0400 Sender: kvm-owner@vger.kernel.org List-ID: qemu-kvm --disable-kvm build regression of commit 8c7d4cb spotted by qemu-kvm buildbot: http://buildbot.b1-systems.de/qemu-kvm/builders/disable_kvm_i386_debian= _5_0/builds/44 http://buildbot.b1-systems.de/qemu-kvm/builders/disable_kvm_x86_64_debi= an_5_0/builds/42 Signed-off-by: Daniel Gollub qemu-kvm.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/qemu-kvm.h b/qemu-kvm.h index 4be6afd..11350f7 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -1157,7 +1157,9 @@ static inline void kvm_arch_get_registers(CPUStat= e *env) { kvm_arch_save_regs(env); kvm_arch_save_mpstate(env); +#ifdef KVM_CAP_MP_STATE env->halted =3D (env->mp_state =3D=3D KVM_MP_STATE_HALTED); +#endif } =20 static inline void kvm_arch_put_registers(CPUState *env) -- --=20 Daniel Gollub Geschaeftsfuehrer: Ralph Dehner =46OSS Developer Unternehmenssitz: Vohburg B1 Systems GmbH Amtsgericht: Ingolstadt Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537 EMail: gollub@b1-systems.de http://www.b1-systems.de Adresse: B1 Systems GmbH, Osterfeldstra=DFe 7, 85088 Vohburg http://pgpkeys.pca.dfn.de/pks/lookup?op=3Dget&search=3D0xED14B95C2F8CA7= 8D