From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Avi Kivity <avi@redhat.com>, LKML <linux-kernel@vger.kernel.org>,
KVM <kvm@vger.kernel.org>
Subject: Re: [PATCH v5 11/12] KVM: x86: introduce set_mmio_exit_info
Date: Sat, 11 Aug 2012 11:13:10 +0800 [thread overview]
Message-ID: <5025CDC6.2050704@linux.vnet.ibm.com> (raw)
In-Reply-To: <20120810180348.GB12477@amt.cnet>
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.
next prev parent reply other threads:[~2012-08-11 3:13 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-07 9:47 [PATCH v5 00/12] KVM: introduce readonly memslot Xiao Guangrong
2012-08-07 9:48 ` [PATCH v5 01/12] KVM: fix missing check for memslot flags Xiao Guangrong
2012-08-07 9:48 ` [PATCH v5 02/12] KVM: hide KVM_MEMSLOT_INVALID from userspace Xiao Guangrong
2012-08-09 18:48 ` Marcelo Tosatti
2012-08-10 2:11 ` Xiao Guangrong
2012-08-07 9:49 ` [PATCH v5 03/12] KVM: introduce gfn_to_pfn_memslot_atomic Xiao Guangrong
2012-08-09 18:50 ` Marcelo Tosatti
2012-08-10 3:22 ` Xiao Guangrong
2012-08-07 9:50 ` [PATCH v5 04/12] KVM: introduce gfn_to_hva_read/kvm_read_hva/kvm_read_hva_atomic Xiao Guangrong
2012-08-07 9:51 ` [PATCH v5 05/12] KVM: reorganize hva_to_pfn Xiao Guangrong
2012-08-10 17:51 ` Marcelo Tosatti
2012-08-11 3:11 ` Xiao Guangrong
2012-08-07 9:51 ` [PATCH v5 06/12] KVM: use 'writable' as a hint to map writable pfn Xiao Guangrong
2012-08-07 9:52 ` [PATCH v5 07/12] KVM: introduce KVM_PFN_ERR_RO_FAULT Xiao Guangrong
2012-08-07 9:52 ` [PATCH v5 08/12] KVM: introduce KVM_HVA_ERR_BAD Xiao Guangrong
2012-08-07 9:53 ` [PATCH v5 09/12] KVM: introduce KVM_HVA_ERR_RO_BAD Xiao Guangrong
2012-08-07 9:54 ` [PATCH v5 10/12] KVM: introduce readonly memslot Xiao Guangrong
2012-08-07 9:54 ` [PATCH v5 11/12] KVM: x86: introduce set_mmio_exit_info Xiao Guangrong
2012-08-10 18:03 ` Marcelo Tosatti
2012-08-11 3:13 ` Xiao Guangrong [this message]
2012-08-07 9:55 ` [PATCH v5 12/12] KVM: indicate readonly access fault Xiao Guangrong
2012-08-10 18:14 ` [PATCH v5 00/12] KVM: introduce readonly memslot Marcelo Tosatti
2012-08-11 3:36 ` Xiao Guangrong
2012-08-13 17:39 ` Marcelo Tosatti
2012-08-14 2:58 ` Xiao Guangrong
2012-08-14 15:25 ` Marcelo Tosatti
2012-08-16 5:49 ` Xiao Guangrong
2012-08-16 16:03 ` Marcelo Tosatti
2012-08-14 14:00 ` Avi Kivity
2012-08-14 15:51 ` Marcelo Tosatti
2012-08-15 10:44 ` Avi Kivity
2012-08-15 17:53 ` Marcelo Tosatti
2012-08-16 9:03 ` Avi Kivity
2012-08-16 15:57 ` Marcelo Tosatti
2012-08-16 16:17 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5025CDC6.2050704@linux.vnet.ibm.com \
--to=xiaoguangrong@linux.vnet.ibm.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).