Commit 94c30d9c authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: x86: Drop unneeded CONFIG_HAS_IOMEM check 



This (broken) check dates back to the days when this code was shared
across architectures. x86 has IOMEM, so drop it.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 9fb41ba8

arch/x86/kvm/x86.c

+0 −2
Original line number Diff line number Diff line
@@ -3814,7 +3814,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		if (r)

			goto out;

	}

#if CONFIG_HAS_IOMEM

	if (vcpu->mmio_needed) {

		memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);

		vcpu->mmio_read_completed = 1;
@@ -3832,7 +3831,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
			goto out;

		}

	}

#endif

	if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL)

		kvm_register_write(vcpu, VCPU_REGS_RAX,

				     kvm_run->hypercall.ret);