summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-02-06 09:43:03 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2010-03-01 12:36:07 -0300
commitc45b4fd416f5497b6b38dd70acc0e5b01399e5c9 (patch)
treebe641dac5be99156204405d5e8cb78765e015d61
parent16fbb5eecc4ab8d4eb4d2a683d7fd74ccacc890b (diff)
downloadtalos-op-linux-c45b4fd416f5497b6b38dd70acc0e5b01399e5c9.tar.gz
talos-op-linux-c45b4fd416f5497b6b38dd70acc0e5b01399e5c9.zip
KVM: VMX: Remove redundant test in vmx_set_efer()
msr was tested above, so the second test is not needed. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ expression *x; expression e; identifier l; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != goto l; when != x = e when != &x *x == NULL // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/vmx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 82fb810afd3f..b400be06c8cd 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1602,8 +1602,6 @@ static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer)
*/
vmx_load_host_state(to_vmx(vcpu));
vcpu->arch.efer = efer;
- if (!msr)
- return;
if (efer & EFER_LMA) {
vmcs_write32(VM_ENTRY_CONTROLS,
vmcs_read32(VM_ENTRY_CONTROLS) |
OpenPOWER on IntegriCloud