Commit 411c35b7 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity

KVM: fill in run->mmio details in (read|write)_emulated function

Fill in run->mmio details in (read|write)_emulated function just like
pio does. There is no point in filling only vcpu fields there just to
copy them into vcpu->run a little bit later.
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e680080e
...@@ -3386,9 +3386,10 @@ static int emulator_read_emulated(unsigned long addr, ...@@ -3386,9 +3386,10 @@ static int emulator_read_emulated(unsigned long addr,
trace_kvm_mmio(KVM_TRACE_MMIO_READ_UNSATISFIED, bytes, gpa, 0); trace_kvm_mmio(KVM_TRACE_MMIO_READ_UNSATISFIED, bytes, gpa, 0);
vcpu->mmio_needed = 1; vcpu->mmio_needed = 1;
vcpu->mmio_phys_addr = gpa; vcpu->run->exit_reason = KVM_EXIT_MMIO;
vcpu->mmio_size = bytes; vcpu->run->mmio.phys_addr = vcpu->mmio_phys_addr = gpa;
vcpu->mmio_is_write = 0; vcpu->run->mmio.len = vcpu->mmio_size = bytes;
vcpu->run->mmio.is_write = vcpu->mmio_is_write = 0;
return X86EMUL_UNHANDLEABLE; return X86EMUL_UNHANDLEABLE;
} }
...@@ -3436,10 +3437,11 @@ static int emulator_write_emulated_onepage(unsigned long addr, ...@@ -3436,10 +3437,11 @@ static int emulator_write_emulated_onepage(unsigned long addr,
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
vcpu->mmio_needed = 1; vcpu->mmio_needed = 1;
vcpu->mmio_phys_addr = gpa; vcpu->run->exit_reason = KVM_EXIT_MMIO;
vcpu->mmio_size = bytes; vcpu->run->mmio.phys_addr = vcpu->mmio_phys_addr = gpa;
vcpu->mmio_is_write = 1; vcpu->run->mmio.len = vcpu->mmio_size = bytes;
memcpy(vcpu->mmio_data, val, bytes); vcpu->run->mmio.is_write = vcpu->mmio_is_write = 1;
memcpy(vcpu->run->mmio.data, val, bytes);
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
} }
...@@ -3850,7 +3852,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu, ...@@ -3850,7 +3852,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
{ {
int r, shadow_mask; int r, shadow_mask;
struct decode_cache *c; struct decode_cache *c;
struct kvm_run *run = vcpu->run;
kvm_clear_exception_queue(vcpu); kvm_clear_exception_queue(vcpu);
vcpu->arch.mmio_fault_cr2 = cr2; vcpu->arch.mmio_fault_cr2 = cr2;
...@@ -3937,14 +3938,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu, ...@@ -3937,14 +3938,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
return EMULATE_DO_MMIO; return EMULATE_DO_MMIO;
} }
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);
run->mmio.len = vcpu->mmio_size;
run->mmio.is_write = vcpu->mmio_is_write;
}
if (r) { if (r) {
if (kvm_mmu_unprotect_page_virt(vcpu, cr2)) if (kvm_mmu_unprotect_page_virt(vcpu, cr2))
goto done; goto done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment