Skip to content

Commit

Permalink
KVM: fill in run->mmio details in (read|write)_emulated function
Browse files Browse the repository at this point in the history
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: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
  • Loading branch information
Gleb Natapov authored and Avi Kivity committed Aug 1, 2010
1 parent e680080 commit 411c35b
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions arch/x86/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -3386,9 +3386,10 @@ static int emulator_read_emulated(unsigned long addr,
trace_kvm_mmio(KVM_TRACE_MMIO_READ_UNSATISFIED, bytes, gpa, 0);

vcpu->mmio_needed = 1;
vcpu->mmio_phys_addr = gpa;
vcpu->mmio_size = bytes;
vcpu->mmio_is_write = 0;
vcpu->run->exit_reason = KVM_EXIT_MMIO;
vcpu->run->mmio.phys_addr = vcpu->mmio_phys_addr = gpa;
vcpu->run->mmio.len = vcpu->mmio_size = bytes;
vcpu->run->mmio.is_write = vcpu->mmio_is_write = 0;

return X86EMUL_UNHANDLEABLE;
}
Expand Down Expand Up @@ -3436,10 +3437,11 @@ static int emulator_write_emulated_onepage(unsigned long addr,
return X86EMUL_CONTINUE;

vcpu->mmio_needed = 1;
vcpu->mmio_phys_addr = gpa;
vcpu->mmio_size = bytes;
vcpu->mmio_is_write = 1;
memcpy(vcpu->mmio_data, val, bytes);
vcpu->run->exit_reason = KVM_EXIT_MMIO;
vcpu->run->mmio.phys_addr = vcpu->mmio_phys_addr = gpa;
vcpu->run->mmio.len = vcpu->mmio_size = bytes;
vcpu->run->mmio.is_write = vcpu->mmio_is_write = 1;
memcpy(vcpu->run->mmio.data, val, bytes);

return X86EMUL_CONTINUE;
}
Expand Down Expand Up @@ -3850,7 +3852,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
{
int r, shadow_mask;
struct decode_cache *c;
struct kvm_run *run = vcpu->run;

kvm_clear_exception_queue(vcpu);
vcpu->arch.mmio_fault_cr2 = cr2;
Expand Down Expand Up @@ -3937,14 +3938,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
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 (kvm_mmu_unprotect_page_virt(vcpu, cr2))
goto done;
Expand Down

0 comments on commit 411c35b

Please sign in to comment.