From patchwork Sat Feb 6 08:43:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 77499 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o168hYR5031151 for ; Sat, 6 Feb 2010 08:43:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753845Ab0BFInH (ORCPT ); Sat, 6 Feb 2010 03:43:07 -0500 Received: from mgw2.diku.dk ([130.225.96.92]:35752 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752761Ab0BFInF (ORCPT ); Sat, 6 Feb 2010 03:43:05 -0500 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id 7BED519BBD5; Sat, 6 Feb 2010 09:43:04 +0100 (CET) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 06564-12; Sat, 6 Feb 2010 09:43:03 +0100 (CET) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw2.diku.dk (Postfix) with ESMTP id 5B8F619BBA2; Sat, 6 Feb 2010 09:43:03 +0100 (CET) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 84E1F6DF894; Sat, 6 Feb 2010 09:38:00 +0100 (CET) Received: by ask.diku.dk (Postfix, from userid 3767) id 40123200AA; Sat, 6 Feb 2010 09:43:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 37329200A9; Sat, 6 Feb 2010 09:43:03 +0100 (CET) Date: Sat, 6 Feb 2010 09:43:03 +0100 (CET) From: Julia Lawall To: Avi Kivity , Marcelo Tosatti , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 4/11] arch/x86/kvm: Correct NULL test Message-ID: MIME-Version: 1.0 X-Virus-Scanned: amavisd-new at diku.dk Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 06 Feb 2010 08:43:35 +0000 (UTC) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 7375ae1..422bfc8 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1609,8 +1609,6 @@ static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer) */ vmx_load_host_state(to_vmx(vcpu)); vcpu->arch.shadow_efer = efer; - if (!msr) - return; if (efer & EFER_LMA) { vmcs_write32(VM_ENTRY_CONTROLS, vmcs_read32(VM_ENTRY_CONTROLS) |