diff options
author | Julia Lawall <julia@diku.dk> | 2010-02-06 03:43:03 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-01 10:36:07 -0500 |
commit | c45b4fd416f5497b6b38dd70acc0e5b01399e5c9 (patch) | |
tree | be641dac5be99156204405d5e8cb78765e015d61 /arch | |
parent | 16fbb5eecc4ab8d4eb4d2a683d7fd74ccacc890b (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
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) | |||
1602 | */ | 1602 | */ |
1603 | vmx_load_host_state(to_vmx(vcpu)); | 1603 | vmx_load_host_state(to_vmx(vcpu)); |
1604 | vcpu->arch.efer = efer; | 1604 | vcpu->arch.efer = efer; |
1605 | if (!msr) | ||
1606 | return; | ||
1607 | if (efer & EFER_LMA) { | 1605 | if (efer & EFER_LMA) { |
1608 | vmcs_write32(VM_ENTRY_CONTROLS, | 1606 | vmcs_write32(VM_ENTRY_CONTROLS, |
1609 | vmcs_read32(VM_ENTRY_CONTROLS) | | 1607 | vmcs_read32(VM_ENTRY_CONTROLS) | |