mbox

[PULL,for-2.9,0/9] virtio, vhost, pc: fixes

Message ID 1481922841-4324-1-git-send-email-mst@redhat.com
State New
Headers show

Pull-request

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

Message

Michael S. Tsirkin Dec. 16, 2016, 9:15 p.m. UTC
The following changes since commit 6a928d25b6d8bc3729c3d28326c6db13b9481059:

  Update version for v2.8.0-rc4 release (2016-12-15 07:36:03 +0000)

are available in the git repository at:

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

for you to fetch changes up to 2858bc68701e282c404ed04d65d4f065e4b40e52:

  virtio: avoid using guest_notifier_mask in vhost-user mode (2016-12-16 01:14:54 +0200)

----------------------------------------------------------------
virtio, vhost, pc: fixes

Here are some bugfixes that didn't make 2.8.

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

----------------------------------------------------------------
Marc-André Lureau (6):
      tests/vhost-user-bridge: remove false comment
      tests/vhost-user-bridge: remove unnecessary dispatcher_remove
      tests/vhost-user-bridge: indicate peer disconnected
      tests/vhost-user-bridge: do not accept more than one connection
      contrib: add libvhost-user
      tests/vhost-user-bridge: use contrib/libvhost-user

Michael S. Tsirkin (1):
      pci: fix error message for express slots

Prasad J Pandit (1):
      i386: amd_iommu: fix MMIO register count and access

Wei Huang (1):
      virtio: avoid using guest_notifier_mask in vhost-user mode

 Makefile                              |    1 +
 contrib/libvhost-user/libvhost-user.h |  435 ++++++++++
 hw/i386/amd_iommu.h                   |    4 +-
 contrib/libvhost-user/libvhost-user.c | 1499 +++++++++++++++++++++++++++++++++
 hw/i386/amd_iommu.c                   |    2 +-
 hw/pci/pci.c                          |    4 +-
 hw/s390x/virtio-ccw.c                 |    4 +-
 hw/virtio/virtio-mmio.c               |    2 +-
 tests/vhost-user-bridge.c             | 1183 +++++---------------------
 Makefile.objs                         |    2 +-
 contrib/libvhost-user/Makefile.objs   |    1 +
 tests/Makefile.include                |    2 +-
 12 files changed, 2175 insertions(+), 964 deletions(-)
 create mode 100644 contrib/libvhost-user/libvhost-user.h
 create mode 100644 contrib/libvhost-user/libvhost-user.c
 create mode 100644 contrib/libvhost-user/Makefile.objs

Comments

no-reply@patchew.org Dec. 16, 2016, 9:32 p.m. UTC | #1
Hi,

Your series seems to have some coding style problems. See output below for
more information:

Type: series
Subject: [Qemu-devel] [PULL for-2.9 0/9] virtio, vhost, pc: fixes
Message-id: 1481922841-4324-1-git-send-email-mst@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

# Useful git options
git config --local diff.renamelimit 0
git config --local diff.renames True

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]         patchew/1481922841-4324-1-git-send-email-mst@redhat.com -> patchew/1481922841-4324-1-git-send-email-mst@redhat.com
Switched to a new branch 'test'
f99ab3b virtio: avoid using guest_notifier_mask in vhost-user mode
3fb701c pci: fix error message for express slots
88360e6 i386: amd_iommu: fix MMIO register count and access
65e5776 tests/vhost-user-bridge: use contrib/libvhost-user
b70c976 contrib: add libvhost-user
b641366 tests/vhost-user-bridge: do not accept more than one connection
a1416a7 tests/vhost-user-bridge: indicate peer disconnected
5ced0b7 tests/vhost-user-bridge: remove unnecessary dispatcher_remove
ee5fbf8 tests/vhost-user-bridge: remove false comment

=== OUTPUT BEGIN ===
Checking PATCH 1/9: tests/vhost-user-bridge: remove false comment...
Checking PATCH 2/9: tests/vhost-user-bridge: remove unnecessary dispatcher_remove...
Checking PATCH 3/9: tests/vhost-user-bridge: indicate peer disconnected...
Checking PATCH 4/9: tests/vhost-user-bridge: do not accept more than one connection...
Checking PATCH 5/9: contrib: add libvhost-user...
ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
#75: FILE: contrib/libvhost-user/libvhost-user.c:9:
+ *  Marc-Andr Lureau <mlureau@redhat.com>
              ^

ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
#1579: FILE: contrib/libvhost-user/libvhost-user.h:8:
+ *  Marc-Andr Lureau <mlureau@redhat.com>
              ^

total: 2 errors, 0 warnings, 1950 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Checking PATCH 6/9: tests/vhost-user-bridge: use contrib/libvhost-user...
Checking PATCH 7/9: i386: amd_iommu: fix MMIO register count and access...
Checking PATCH 8/9: pci: fix error message for express slots...
Checking PATCH 9/9: virtio: avoid using guest_notifier_mask in vhost-user mode...
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
Peter Maydell Dec. 17, 2016, 11:18 a.m. UTC | #2
On 16 December 2016 at 21:32,  <no-reply@patchew.org> wrote:
> Your series seems to have some coding style problems. See output below for
> more information:
>
> Type: series
> Subject: [Qemu-devel] [PULL for-2.9 0/9] virtio, vhost, pc: fixes
> Message-id: 1481922841-4324-1-git-send-email-mst@redhat.com

> Checking PATCH 5/9: contrib: add libvhost-user...
> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> #75: FILE: contrib/libvhost-user/libvhost-user.c:9:
> + *  Marc-Andr Lureau <mlureau@redhat.com>
>               ^
>
> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> #1579: FILE: contrib/libvhost-user/libvhost-user.h:8:
> + *  Marc-Andr Lureau <mlureau@redhat.com>
>               ^
>
> total: 2 errors, 0 warnings, 1950 lines checked

Michael, could you check the encoding in that file and respin
the patchset if necessary, please?

thanks
-- PMM
Michael S. Tsirkin Jan. 6, 2017, 8:04 p.m. UTC | #3
On Sat, Dec 17, 2016 at 11:18:03AM +0000, Peter Maydell wrote:
> On 16 December 2016 at 21:32,  <no-reply@patchew.org> wrote:
> > Your series seems to have some coding style problems. See output below for
> > more information:
> >
> > Type: series
> > Subject: [Qemu-devel] [PULL for-2.9 0/9] virtio, vhost, pc: fixes
> > Message-id: 1481922841-4324-1-git-send-email-mst@redhat.com
> 
> > Checking PATCH 5/9: contrib: add libvhost-user...
> > ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> > #75: FILE: contrib/libvhost-user/libvhost-user.c:9:
> > + *  Marc-Andr Lureau <mlureau@redhat.com>
> >               ^
> >
> > ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> > #1579: FILE: contrib/libvhost-user/libvhost-user.h:8:
> > + *  Marc-Andr Lureau <mlureau@redhat.com>
> >               ^
> >
> > total: 2 errors, 0 warnings, 1950 lines checked
> 
> Michael, could you check the encoding in that file and respin
> the patchset if necessary, please?
> 
> thanks
> -- PMM

I have no idea what this means.

00000000: 202a 2020 4d61 7263 2d41 6e64 72c3 a920   *  Marc-Andr.. 
00000010: 4c75 7265 6175 203c 6d6c 7572 6561 7540  Lureau <mlureau@
00000020: 7265 6468 6174 2e63 6f6d 3e0a            redhat.com>.

So c3 a9, seems to be right:
https://mothereff.in/utf-8#%C3%A9

Any idea?
Eric Blake Jan. 6, 2017, 8:38 p.m. UTC | #4
On 01/06/2017 02:04 PM, Michael S. Tsirkin wrote:
> On Sat, Dec 17, 2016 at 11:18:03AM +0000, Peter Maydell wrote:
>> On 16 December 2016 at 21:32,  <no-reply@patchew.org> wrote:
>>> Your series seems to have some coding style problems. See output below for
>>> more information:
>>>
>>> Type: series
>>> Subject: [Qemu-devel] [PULL for-2.9 0/9] virtio, vhost, pc: fixes
>>> Message-id: 1481922841-4324-1-git-send-email-mst@redhat.com
>>
>>> Checking PATCH 5/9: contrib: add libvhost-user...
>>> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
>>> #75: FILE: contrib/libvhost-user/libvhost-user.c:9:
>>> + *  Marc-Andr Lureau <mlureau@redhat.com>
>>>               ^
>>>
>>> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
>>> #1579: FILE: contrib/libvhost-user/libvhost-user.h:8:
>>> + *  Marc-Andr Lureau <mlureau@redhat.com>
>>>               ^
>>>
>>> total: 2 errors, 0 warnings, 1950 lines checked
>>
>> Michael, could you check the encoding in that file and respin
>> the patchset if necessary, please?
>>
>> thanks
>> -- PMM
> 
> I have no idea what this means.

Look at the headers to patch 5/9:

Subject: [PULL for-2.9 5/9] contrib: add libvhost-user
Message-ID: <1481922841-4324-6-git-send-email-mst@redhat.com>
References: <1481922841-4324-1-git-send-email-mst@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1

Although that mail body says
From: Marc-André Lureau <marcandre.lureau@redhat.com>
it was doing so with the single-byte character from the iso-8859-1
character set, instead of the multibyte UTF-8 character set.

Compare that to another recent pull request from Gerd:

Date: Wed,  4 Jan 2017 12:21:20 +0100
Message-Id: <1483528883-1753-9-git-send-email-kraxel@redhat.com>
In-Reply-To: <1483528883-1753-1-git-send-email-kraxel@redhat.com>
References: <1483528883-1753-1-git-send-email-kraxel@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

where the mail body says:
From: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>

So somehow, your git settings differ from Gerd, in that your 'git
send-email' (or however you are sending your pull request) is not
picking the correct encoding.  The buildbot is NOT seeing UTF-8, but
ISO-8859-1 characters from your pull request, and is apparently unable
to run iconv on the result before testing the patches out, resulting in
the dropped bytes that are not already UTF-8 encoded.  My mail reader,
on the other hand, is smart enough to recognize both encodings, and my
mail window sees the name correctly formatted in both mails, with no
visual indication that the sources for the two mails were in different
encodings.  Which makes it a rather insidious problem to track down, if
you don't spot the difference until dealing with some tool that isn't
smart enough to do automatic conversion.

But how to force git to send mail in UTF-8 is not something I've had to
figure out (I'm relying on my distro's defaults) - you'll have to poke
around your .git/config (or ~/.gitconfig) and see if you have some
really old settings from an earlier time, or ask around on freenode's
#git channel for better ideas.
Eric Blake Jan. 6, 2017, 8:42 p.m. UTC | #5
On 01/06/2017 02:38 PM, Eric Blake wrote:
> 
> But how to force git to send mail in UTF-8 is not something I've had to
> figure out (I'm relying on my distro's defaults) - you'll have to poke
> around your .git/config (or ~/.gitconfig) and see if you have some
> really old settings from an earlier time, or ask around on freenode's
> #git channel for better ideas.

The git config settings for i18n.commitEncoding and
i18n.logOutputEncoding may be relevant, as may
sendemail.transferEncoding and sendemail.assume8bitEncoding.
Michael S. Tsirkin Jan. 6, 2017, 9:20 p.m. UTC | #6
On Fri, Jan 06, 2017 at 02:38:32PM -0600, Eric Blake wrote:
> On 01/06/2017 02:04 PM, Michael S. Tsirkin wrote:
> > On Sat, Dec 17, 2016 at 11:18:03AM +0000, Peter Maydell wrote:
> >> On 16 December 2016 at 21:32,  <no-reply@patchew.org> wrote:
> >>> Your series seems to have some coding style problems. See output below for
> >>> more information:
> >>>
> >>> Type: series
> >>> Subject: [Qemu-devel] [PULL for-2.9 0/9] virtio, vhost, pc: fixes
> >>> Message-id: 1481922841-4324-1-git-send-email-mst@redhat.com
> >>
> >>> Checking PATCH 5/9: contrib: add libvhost-user...
> >>> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> >>> #75: FILE: contrib/libvhost-user/libvhost-user.c:9:
> >>> + *  Marc-Andr Lureau <mlureau@redhat.com>
> >>>               ^
> >>>
> >>> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> >>> #1579: FILE: contrib/libvhost-user/libvhost-user.h:8:
> >>> + *  Marc-Andr Lureau <mlureau@redhat.com>
> >>>               ^
> >>>
> >>> total: 2 errors, 0 warnings, 1950 lines checked
> >>
> >> Michael, could you check the encoding in that file and respin
> >> the patchset if necessary, please?
> >>
> >> thanks
> >> -- PMM
> > 
> > I have no idea what this means.
> 
> Look at the headers to patch 5/9:
> 
> Subject: [PULL for-2.9 5/9] contrib: add libvhost-user
> Message-ID: <1481922841-4324-6-git-send-email-mst@redhat.com>
> References: <1481922841-4324-1-git-send-email-mst@redhat.com>
> MIME-Version: 1.0
> Content-Type: text/plain; charset=iso-8859-1
> 
> Although that mail body says
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> it was doing so with the single-byte character from the iso-8859-1
> character set, instead of the multibyte UTF-8 character set.
> 
> Compare that to another recent pull request from Gerd:
> 
> Date: Wed,  4 Jan 2017 12:21:20 +0100
> Message-Id: <1483528883-1753-9-git-send-email-kraxel@redhat.com>
> In-Reply-To: <1483528883-1753-1-git-send-email-kraxel@redhat.com>
> References: <1483528883-1753-1-git-send-email-kraxel@redhat.com>
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: quoted-printable
> 
> where the mail body says:
> From: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
> 
> So somehow, your git settings differ from Gerd, in that your 'git
> send-email' (or however you are sending your pull request) is not
> picking the correct encoding.  The buildbot is NOT seeing UTF-8, but
> ISO-8859-1 characters from your pull request, and is apparently unable
> to run iconv on the result before testing the patches out, resulting in
> the dropped bytes that are not already UTF-8 encoded.  My mail reader,
> on the other hand, is smart enough to recognize both encodings, and my
> mail window sees the name correctly formatted in both mails, with no
> visual indication that the sources for the two mails were in different
> encodings.  Which makes it a rather insidious problem to track down, if
> you don't spot the difference until dealing with some tool that isn't
> smart enough to do automatic conversion.
> 
> But how to force git to send mail in UTF-8 is not something I've had to
> figure out (I'm relying on my distro's defaults) - you'll have to poke
> around your .git/config (or ~/.gitconfig) and see if you have some
> really old settings from an earlier time, or ask around on freenode's
> #git channel for better ideas.
> 
> -- 
> Eric Blake   eblake redhat com    +1-919-301-3266
> Libvirt virtualization library http://libvirt.org
> 

So the email might be malformed, but git commits are ok I think.
Peter, could you pls merge? I'll investigate my email settings later.
Peter Maydell Jan. 9, 2017, 4:29 p.m. UTC | #7
On 6 January 2017 at 21:20, Michael S. Tsirkin <mst@redhat.com> wrote:
> So the email might be malformed, but git commits are ok I think.
> Peter, could you pls merge? I'll investigate my email settings later.

Applied to master, thanks.

-- PMM
Michael S. Tsirkin Jan. 9, 2017, 4:48 p.m. UTC | #8
On Fri, Dec 16, 2016 at 01:32:04PM -0800, no-reply@patchew.org wrote:
> Hi,
> 
> Your series seems to have some coding style problems. See output below for
> more information:
> 
> Type: series
> Subject: [Qemu-devel] [PULL for-2.9 0/9] virtio, vhost, pc: fixes
> Message-id: 1481922841-4324-1-git-send-email-mst@redhat.com
> 
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> 
> BASE=base
> n=1
> total=$(git log --oneline $BASE.. | wc -l)
> failed=0
> 
> # Useful git options
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> 
> commits="$(git log --format=%H --reverse $BASE..)"
> for c in $commits; do
>     echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
>     if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
>         failed=1
>         echo
>     fi
>     n=$((n+1))
> done
> 
> exit $failed
> === TEST SCRIPT END ===
> 
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> From https://github.com/patchew-project/qemu
>  * [new tag]         patchew/1481922841-4324-1-git-send-email-mst@redhat.com -> patchew/1481922841-4324-1-git-send-email-mst@redhat.com
> Switched to a new branch 'test'
> f99ab3b virtio: avoid using guest_notifier_mask in vhost-user mode
> 3fb701c pci: fix error message for express slots
> 88360e6 i386: amd_iommu: fix MMIO register count and access
> 65e5776 tests/vhost-user-bridge: use contrib/libvhost-user
> b70c976 contrib: add libvhost-user
> b641366 tests/vhost-user-bridge: do not accept more than one connection
> a1416a7 tests/vhost-user-bridge: indicate peer disconnected
> 5ced0b7 tests/vhost-user-bridge: remove unnecessary dispatcher_remove
> ee5fbf8 tests/vhost-user-bridge: remove false comment

The strange thing here is that this actually seems to apply patches
from list instead of getting the tag from the tree.



> === OUTPUT BEGIN ===
> Checking PATCH 1/9: tests/vhost-user-bridge: remove false comment...
> Checking PATCH 2/9: tests/vhost-user-bridge: remove unnecessary dispatcher_remove...
> Checking PATCH 3/9: tests/vhost-user-bridge: indicate peer disconnected...
> Checking PATCH 4/9: tests/vhost-user-bridge: do not accept more than one connection...
> Checking PATCH 5/9: contrib: add libvhost-user...
> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> #75: FILE: contrib/libvhost-user/libvhost-user.c:9:
> + *  Marc-Andr Lureau <mlureau@redhat.com>
>               ^
> 
> ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
> #1579: FILE: contrib/libvhost-user/libvhost-user.h:8:
> + *  Marc-Andr Lureau <mlureau@redhat.com>
>               ^
> 
> total: 2 errors, 0 warnings, 1950 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> 
> Checking PATCH 6/9: tests/vhost-user-bridge: use contrib/libvhost-user...
> Checking PATCH 7/9: i386: amd_iommu: fix MMIO register count and access...
> Checking PATCH 8/9: pci: fix error message for express slots...
> Checking PATCH 9/9: virtio: avoid using guest_notifier_mask in vhost-user mode...
> === OUTPUT END ===
> 
> Test command exited with code: 1
> 
> 
> ---
> Email generated automatically by Patchew [http://patchew.org/].
> Please send your feedback to patchew-devel@freelists.org
Peter Maydell Jan. 9, 2017, 5:28 p.m. UTC | #9
On 9 January 2017 at 16:48, Michael S. Tsirkin <mst@redhat.com> wrote:
> The strange thing here is that this actually seems to apply patches
> from list instead of getting the tag from the tree.

That's because it's really supposed to be working on patches sent
to the list -- it only checks pull requests because it can't
tell them apart from patches, I think.

thanks
-- PMM
Fam Zheng Jan. 10, 2017, 1:34 a.m. UTC | #10
On Mon, 01/09 17:28, Peter Maydell wrote:
> On 9 January 2017 at 16:48, Michael S. Tsirkin <mst@redhat.com> wrote:
> > The strange thing here is that this actually seems to apply patches
> > from list instead of getting the tag from the tree.
> 
> That's because it's really supposed to be working on patches sent
> to the list -- it only checks pull requests because it can't
> tell them apart from patches, I think.

It can be taught not to check pull requests but I don't see a reason to, maybe
it's better to let patchew pull the tag instead of applying, but on the other
hand it's a bit odd to assume they two differ, that's why I haven't done it.

Fam
Michael S. Tsirkin Jan. 10, 2017, 3:01 a.m. UTC | #11
On Tue, Jan 10, 2017 at 09:34:20AM +0800, Fam Zheng wrote:
> On Mon, 01/09 17:28, Peter Maydell wrote:
> > On 9 January 2017 at 16:48, Michael S. Tsirkin <mst@redhat.com> wrote:
> > > The strange thing here is that this actually seems to apply patches
> > > from list instead of getting the tag from the tree.
> > 
> > That's because it's really supposed to be working on patches sent
> > to the list -- it only checks pull requests because it can't
> > tell them apart from patches, I think.
> 
> It can be taught not to check pull requests but I don't see a reason to, maybe
> it's better to let patchew pull the tag instead of applying, but on the other
> hand it's a bit odd to assume they two differ, that's why I haven't done it.
> 
> Fam

Well it's definitely better to actually test the pull req
as it is and not test patches applied at a random master.