KVM: drop unneeded kvm_run check in emulate_instruction()
authorGleb Natapov <gleb@redhat.com>
Sun, 21 Feb 2010 13:00:47 +0000 (15:00 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 25 Apr 2010 09:38:08 +0000 (12:38 +0300)
vcpu->run is initialized on vcpu creation and can never be NULL
here.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/x86.c

index 274a8e3..1d27a57 100644 (file)
@@ -3443,7 +3443,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
        if (vcpu->arch.pio.string)
                return EMULATE_DO_MMIO;
 
-       if ((r || vcpu->mmio_is_write) && run) {
+       if (r || vcpu->mmio_is_write) {
                run->exit_reason = KVM_EXIT_MMIO;
                run->mmio.phys_addr = vcpu->mmio_phys_addr;
                memcpy(run->mmio.data, vcpu->mmio_data, 8);