Skip to contentSkip to conversation

KVM: x86: Drop unneeded CONFIG_HAS_IOMEM check

PATCH Applied Jan Kiszka 2 participants 2 messages Oct 12, 2009 – Oct 13, 2009

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 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 Jan Kiszka <[email protected]>

---

 arch/x86/kvm/x86.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +0 -2
index 11a6f2f..12de5bb 100644
@@ -3802,7 +3802,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;

@@ -3820,7 +3819,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);