From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 4/5] KVM: Fix compound mmio. Date: Tue, 12 Apr 2011 15:19:00 +0300 Message-ID: <4DA44334.2090905@redhat.com> References: <1302600985-10704-1-git-send-email-gleb@redhat.com> <1302600985-10704-4-git-send-email-gleb@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, mtosatti@redhat.com To: Gleb Natapov Return-path: Received: from mx1.redhat.com ([209.132.183.28]:32168 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028Ab1DLMTD (ORCPT ); Tue, 12 Apr 2011 08:19:03 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3CCJ34S005486 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 12 Apr 2011 08:19:03 -0400 In-Reply-To: <1302600985-10704-4-git-send-email-gleb@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 04/12/2011 12:36 PM, Gleb Natapov wrote: > mmio_index should be taken into account when copying data from > userspace. > > Signed-off-by: Gleb Natapov > --- > arch/x86/kvm/x86.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index b568779..609c7ab 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -5518,7 +5518,8 @@ static int complete_mmio(struct kvm_vcpu *vcpu) > if (vcpu->mmio_needed) { > vcpu->mmio_needed = 0; > if (!vcpu->mmio_is_write) > - memcpy(vcpu->mmio_data, run->mmio.data, 8); > + memcpy(vcpu->mmio_data + vcpu->mmio_index, > + run->mmio.data, 8); > vcpu->mmio_index += 8; > if (vcpu->mmio_index< vcpu->mmio_size) { > run->exit_reason = KVM_EXIT_MMIO; Interesting, the code passed the emulator.flat sse test. Does it now? -- error compiling committee.c: too many arguments to function