[Qemu-devel] [PULL 0/1] virtio update

[Qemu-devel] [PULL 0/1] virtio update

[Michael S. Tsirkin]

Resending: same as previous pull request but with numbers in the subject.
Sorry about the noise.


The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88:

  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100)

are available in the git repository at:


  git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream

for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b:

  virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300)

----------------------------------------------------------------
virtio update

looks like a quiet week
minor bugfix in virtio by myself

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Michael S. Tsirkin (1):
      virtio: allow mapping up to max queue size

 hw/virtio/virtio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] virtio: allow mapping up to max queue size

[Michael S. Tsirkin]

It's a loop from i < num_sg  and the array is VIRTQUEUE_MAX_SIZE - so
it's OK if the value read is VIRTQUEUE_MAX_SIZE.

Not a big problem in practice as people don't use
such big queues, but it's inelegant.

Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/virtio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 7f4e7ec..3557c17 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -430,7 +430,7 @@ void virtqueue_map_sg(struct iovec *sg, hwaddr *addr,
     unsigned int i;
     hwaddr len;
 
-    if (num_sg >= VIRTQUEUE_MAX_SIZE) {
+    if (num_sg > VIRTQUEUE_MAX_SIZE) {
         error_report("virtio: map attempt out of bounds: %zd > %d",
                      num_sg, VIRTQUEUE_MAX_SIZE);
         exit(1);
-- 
MST

Re: [Qemu-devel] [PULL 0/1] virtio update

[Peter Maydell]

On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> Resending: same as previous pull request but with numbers in the subject.
> Sorry about the noise.
>
>
> The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88:
>
>   Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100)
>
> are available in the git repository at:
>
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream
>
> for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b:
>
>   virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300)

My apply-pullreq script complains:
merge: remotes/mst/for_upstream - not something we can merge

did you mean "tags/for_upstream" ?

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] virtio update

[Michael S. Tsirkin]

On Thu, May 15, 2014 at 05:32:05PM +0100, Peter Maydell wrote:
> On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote:
> >
> > Resending: same as previous pull request but with numbers in the subject.
> > Sorry about the noise.
> >
> >
> > The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88:
> >
> >   Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100)
> >
> > are available in the git repository at:
> >
> >
> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream
> >
> > for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b:
> >
> >   virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300)
> 
> My apply-pullreq script complains:
> merge: remotes/mst/for_upstream - not something we can merge
> 
> did you mean "tags/for_upstream" ?
> 
> thanks
> -- PMM

Yes: git used to get this right but it looks like it's broken in git
master.
hashes match and it's signed properly ...
want me to resend?

-- 
MST

Re: [Qemu-devel] [PULL 0/1] virtio update

[Peter Maydell]

On 15 May 2014 17:33, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Thu, May 15, 2014 at 05:32:05PM +0100, Peter Maydell wrote:
>> On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote:
>> >
>> > Resending: same as previous pull request but with numbers in the subject.
>> > Sorry about the noise.
>> >
>> >
>> > The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88:
>> >
>> >   Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100)
>> >
>> > are available in the git repository at:
>> >
>> >
>> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream
>> >
>> > for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b:
>> >
>> >   virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300)
>>
>> My apply-pullreq script complains:
>> merge: remotes/mst/for_upstream - not something we can merge
>>
>> did you mean "tags/for_upstream" ?
>>
>> thanks
>> -- PMM
>
> Yes: git used to get this right but it looks like it's broken in git
> master.
> hashes match and it's signed properly ...
> want me to resend?

That's OK, I just wanted to check the tag name. (I notice this
kind of mismatch because I just copy-paste the url-and-branchname
onto my commandline. Also if we were ever to implement some kind
of automatic testing of pull-request-emails the automated script
would notice :-))

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/1] virtio update

[Michael S. Tsirkin]

On Thu, May 15, 2014 at 06:35:05PM +0100, Peter Maydell wrote:
> On 15 May 2014 17:33, Michael S. Tsirkin <mst@redhat.com> wrote:
> > On Thu, May 15, 2014 at 05:32:05PM +0100, Peter Maydell wrote:
> >> On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote:
> >> >
> >> > Resending: same as previous pull request but with numbers in the subject.
> >> > Sorry about the noise.
> >> >
> >> >
> >> > The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88:
> >> >
> >> >   Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100)
> >> >
> >> > are available in the git repository at:
> >> >
> >> >
> >> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream
> >> >
> >> > for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b:
> >> >
> >> >   virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300)
> >>
> >> My apply-pullreq script complains:
> >> merge: remotes/mst/for_upstream - not something we can merge
> >>
> >> did you mean "tags/for_upstream" ?
> >>
> >> thanks
> >> -- PMM
> >
> > Yes: git used to get this right but it looks like it's broken in git
> > master.
> > hashes match and it's signed properly ...
> > want me to resend?
> 
> That's OK, I just wanted to check the tag name. (I notice this
> kind of mismatch because I just copy-paste the url-and-branchname
> onto my commandline. Also if we were ever to implement some kind
> of automatic testing of pull-request-emails the automated script
> would notice :-))
> 
> Applied, thanks.
> 
> -- PMM


Note for git 2.0 users (once that's out): you must use tags/<name>
for your pull requests, otherwise people using older clients will fail to pull
from you.

-- 
MST