From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Drop redundant kvm_reset_mpstate Date: Wed, 29 Dec 2010 19:53:39 +0100 Message-ID: <4D1B83B3.4060607@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm To: Avi Kivity , Marcelo Tosatti Return-path: Received: from fmmailgate03.web.de ([217.72.192.234]:51683 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753166Ab0L2Sxl (ORCPT ); Wed, 29 Dec 2010 13:53:41 -0500 Sender: kvm-owner@vger.kernel.org List-ID: From: Jan Kiszka kvm_arch_reset_vcpu includes the same logic (minus the obsolete feature check), and every caller of kvm_reset_mpstate also calls that function. Signed-off-by: Jan Kiszka --- qemu-kvm-x86.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 672bcbf..2f1a090 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -564,20 +564,6 @@ static void kvm_arch_load_mpstate(CPUState *env) #endif } -static void kvm_reset_mpstate(CPUState *env) -{ -#ifdef KVM_CAP_MP_STATE - if (kvm_check_extension(kvm_state, KVM_CAP_MP_STATE)) { - if (kvm_irqchip_in_kernel()) { - env->mp_state = cpu_is_bsp(env) ? KVM_MP_STATE_RUNNABLE : - KVM_MP_STATE_UNINITIALIZED; - } else { - env->mp_state = KVM_MP_STATE_RUNNABLE; - } - } -#endif -} - #define XSAVE_CWD_RIP 2 #define XSAVE_CWD_RDP 4 #define XSAVE_MXCSR 6 @@ -652,7 +638,6 @@ static int _kvm_arch_init_vcpu(CPUState *env) #ifdef KVM_EXIT_TPR_ACCESS kvm_enable_tpr_access_reporting(env); #endif - kvm_reset_mpstate(env); return 0; } @@ -761,7 +746,6 @@ void kvm_arch_cpu_reset(CPUState *env) { kvm_reset_msrs(env); kvm_arch_reset_vcpu(env); - kvm_reset_mpstate(env); } #ifdef CONFIG_KVM_DEVICE_ASSIGNMENT