diff options
author | Jan Kiszka <jan.kiszka@web.de> | 2009-10-12 02:51:40 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-12-03 02:32:18 -0500 |
commit | 94c30d9ca6fd00a69e367b91b6e13572c41938c5 (patch) | |
tree | 5075c2b883b3b68f01984d81c3e983977f6c72e9 /arch/x86/kvm | |
parent | 9fb41ba8962b18159e16cac81e7d57e897964038 (diff) |
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 <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3cffa2cac70..5d450cc6f84 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -3814,7 +3814,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
3814 | if (r) | 3814 | if (r) |
3815 | goto out; | 3815 | goto out; |
3816 | } | 3816 | } |
3817 | #if CONFIG_HAS_IOMEM | ||
3818 | if (vcpu->mmio_needed) { | 3817 | if (vcpu->mmio_needed) { |
3819 | memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); | 3818 | memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); |
3820 | vcpu->mmio_read_completed = 1; | 3819 | vcpu->mmio_read_completed = 1; |
@@ -3832,7 +3831,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
3832 | goto out; | 3831 | goto out; |
3833 | } | 3832 | } |
3834 | } | 3833 | } |
3835 | #endif | ||
3836 | if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) | 3834 | if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) |
3837 | kvm_register_write(vcpu, VCPU_REGS_RAX, | 3835 | kvm_register_write(vcpu, VCPU_REGS_RAX, |
3838 | kvm_run->hypercall.ret); | 3836 | kvm_run->hypercall.ret); |