aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kvm/mmio.c')
-rw-r--r--arch/arm/kvm/mmio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 3a10c9f1d0a4..387ee2a11e36 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -113,7 +113,7 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)
113 } 113 }
114 114
115 trace_kvm_mmio(KVM_TRACE_MMIO_READ, len, run->mmio.phys_addr, 115 trace_kvm_mmio(KVM_TRACE_MMIO_READ, len, run->mmio.phys_addr,
116 data); 116 &data);
117 data = vcpu_data_host_to_guest(vcpu, data, len); 117 data = vcpu_data_host_to_guest(vcpu, data, len);
118 vcpu_set_reg(vcpu, vcpu->arch.mmio_decode.rt, data); 118 vcpu_set_reg(vcpu, vcpu->arch.mmio_decode.rt, data);
119 } 119 }
@@ -189,14 +189,14 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
189 data = vcpu_data_guest_to_host(vcpu, vcpu_get_reg(vcpu, rt), 189 data = vcpu_data_guest_to_host(vcpu, vcpu_get_reg(vcpu, rt),
190 len); 190 len);
191 191
192 trace_kvm_mmio(KVM_TRACE_MMIO_WRITE, len, fault_ipa, data); 192 trace_kvm_mmio(KVM_TRACE_MMIO_WRITE, len, fault_ipa, &data);
193 mmio_write_buf(data_buf, len, data); 193 mmio_write_buf(data_buf, len, data);
194 194
195 ret = kvm_io_bus_write(vcpu, KVM_MMIO_BUS, fault_ipa, len, 195 ret = kvm_io_bus_write(vcpu, KVM_MMIO_BUS, fault_ipa, len,
196 data_buf); 196 data_buf);
197 } else { 197 } else {
198 trace_kvm_mmio(KVM_TRACE_MMIO_READ_UNSATISFIED, len, 198 trace_kvm_mmio(KVM_TRACE_MMIO_READ_UNSATISFIED, len,
199 fault_ipa, 0); 199 fault_ipa, NULL);
200 200
201 ret = kvm_io_bus_read(vcpu, KVM_MMIO_BUS, fault_ipa, len, 201 ret = kvm_io_bus_read(vcpu, KVM_MMIO_BUS, fault_ipa, len,
202 data_buf); 202 data_buf);