From patchwork Wed Sep 9 23:10:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gollub X-Patchwork-Id: 46479 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n89N92g1018592 for ; Wed, 9 Sep 2009 23:09:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753403AbZIIXI0 (ORCPT ); Wed, 9 Sep 2009 19:08:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752617AbZIIXI0 (ORCPT ); Wed, 9 Sep 2009 19:08:26 -0400 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 Received: from [83.171.144.73] (helo=marvin.localnet) by d112.x-mailer.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1MlWH2-00036O-8j; Thu, 10 Sep 2009 01:08:24 +0200 From: Daniel Gollub Organization: B1 Systems GmbH To: avi@redhat.com Subject: [PATCH] Fix --disable-kvm build regression of commit 8c7d4cb Date: Thu, 10 Sep 2009 01:10:20 +0200 User-Agent: KMail/1.12.1 (Linux/2.6.27.29-0.1-default; KDE/4.3.0; x86_64; ; ) Cc: kvm@vger.kernel.org, Gleb Natapov MIME-Version: 1.0 Message-Id: <200909100110.20894.gollub@b1-systems.de> X-Info: valid message X-Info: original Date Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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_debian_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(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)