On 08/11/2012 02:03 AM, Marcelo Tosatti wrote:
>> int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr,
>> void *val, unsigned int bytes,
>> struct x86_exception *exception,
>> @@ -3870,14 +3881,10 @@ int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr,
>> return rc;
>>
>> gpa = vcpu->mmio_fragments[0].gpa;
>> -
>> vcpu->mmio_needed = 1;
>> vcpu->mmio_cur_fragment = 0;
>>
>> - vcpu->run->mmio.len = vcpu->mmio_fragments[0].len;
>> - vcpu->run->mmio.is_write = vcpu->mmio_is_write = ops->write;
>> - vcpu->run->exit_reason = KVM_EXIT_MMIO;
>> - vcpu->run->mmio.phys_addr = gpa;
>> + set_mmio_exit_info(vcpu, &vcpu->mmio_fragments[0], ops->write);
>>
>> return ops->read_write_exit_mmio(vcpu, gpa, val, bytes);
>> }
>> @@ -5486,7 +5493,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
>> */
>> static int complete_mmio(struct kvm_vcpu *vcpu)
>> {
>> - struct kvm_run *run = vcpu->run;
>> struct kvm_mmio_fragment *frag;
>> int r;
>>
>> @@ -5497,7 +5503,7 @@ static int complete_mmio(struct kvm_vcpu *vcpu)
>> /* Complete previous fragment */
>> frag = &vcpu->mmio_fragments[vcpu->mmio_cur_fragment++];
>> if (!vcpu->mmio_is_write)
>> - memcpy(frag->data, run->mmio.data, frag->len);
>> + memcpy(frag->data, vcpu->run->mmio.data, frag->len);
>> if (vcpu->mmio_cur_fragment == vcpu->mmio_nr_fragments) {
>> vcpu->mmio_needed = 0;
>> if (vcpu->mmio_is_write)
>> @@ -5507,12 +5513,7 @@ static int complete_mmio(struct kvm_vcpu *vcpu)
>> }
>> /* Initiate next fragment */
>> ++frag;
>> - run->exit_reason = KVM_EXIT_MMIO;
>> - run->mmio.phys_addr = frag->gpa;
>> - if (vcpu->mmio_is_write)
>> - memcpy(run->mmio.data, frag->data, frag->len);
>> - run->mmio.len = frag->len;
>> - run->mmio.is_write = vcpu->mmio_is_write;
>> + set_mmio_exit_info(vcpu, frag, vcpu->mmio_is_write);
>> return 0;
>>
>> }
>> --
>> 1.7.7.6
>
> IMO having a function is unnecessary (it makes it harder the code).
Okay, i will drop this patch.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
