mbox

[PULL,0/9] pci, virtio, vhost: fixes

Message ID 1494443192-17177-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 May 10, 2017, 7:07 p.m. UTC
The following changes since commit 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb:

  Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging (2017-05-09 15:49:14 -0400)

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 8b12e48950a3d59188489b2ff6c5ad9cc09e9866:

  acpi-defs: clean up open brace usage (2017-05-10 22:04:23 +0300)

----------------------------------------------------------------
pci, virtio, vhost: fixes

A bunch of fixes that missed the release.

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

----------------------------------------------------------------
Ard Biesheuvel (2):
      hw/acpi-defs: replace leading X with x_ in FADT field names
      hw/arm/virt: generate 64-bit addressable ACPI objects

Bruce Rogers (1):
      ACPI: don't call acpi_pcihp_device_plug_cb on xen

Eduardo Habkost (1):
      iommu: Don't crash if machine is not PC_MACHINE

Igor Mammedov (1):
      pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot

Marc-André Lureau (1):
      libvhost-user: fix crash when rings aren't ready

Michael S. Tsirkin (1):
      acpi-defs: clean up open brace usage

Peter Xu (1):
      pc: add 2.10 machine type

Zhiyong Yang (1):
      hw/virtio: fix vhost user fails to startup when MQ

 contrib/libvhost-user/libvhost-user.h |  6 ++---
 include/hw/acpi/acpi-defs.h           | 45 ++++++++++++++++++-----------------
 include/hw/acpi/aml-build.h           |  3 +++
 include/hw/i386/pc.h                  | 10 ++++----
 contrib/libvhost-user/libvhost-user.c | 26 +++++++++++++++-----
 hw/acpi/aml-build.c                   | 27 +++++++++++++++++++++
 hw/acpi/piix4.c                       | 11 ++++++---
 hw/arm/virt-acpi-build.c              | 26 ++++++++++----------
 hw/i386/acpi-build.c                  |  4 ++--
 hw/i386/amd_iommu.c                   | 15 +++++++++++-
 hw/i386/intel_iommu.c                 | 14 +++++++++--
 hw/i386/pc.c                          |  9 ++++---
 hw/i386/pc_piix.c                     | 16 ++++++++++---
 hw/i386/pc_q35.c                      | 14 +++++++++--
 hw/virtio/vhost-user.c                | 21 +++++++++-------
 tests/bios-tables-test.c              |  4 ++--
 16 files changed, 175 insertions(+), 76 deletions(-)

Comments

no-reply@patchew.org May 10, 2017, 7:48 p.m. UTC | #1
Hi,

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

Subject: [Qemu-devel] [PULL 0/9] pci, virtio, vhost: fixes
Type: series
Message-id: 1494443192-17177-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

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
Switched to a new branch 'test'
57ccbd1 acpi-defs: clean up open brace usage
07c0790 ACPI: don't call acpi_pcihp_device_plug_cb on xen
b842f71 iommu: Don't crash if machine is not PC_MACHINE
c39cd6d pc: add 2.10 machine type
230807c pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot
5bd5d2a libvhost-user: fix crash when rings aren't ready
a1e27ce hw/virtio: fix vhost user fails to startup when MQ
674eae2 hw/arm/virt: generate 64-bit addressable ACPI objects
22d0ae0 hw/acpi-defs: replace leading X with x_ in FADT field names

=== OUTPUT BEGIN ===
Checking PATCH 1/9: hw/acpi-defs: replace leading X with x_ in FADT field names...
Checking PATCH 2/9: hw/arm/virt: generate 64-bit addressable ACPI objects...
ERROR: open brace '{' following struct go on the same line
#157: FILE: include/hw/acpi/acpi-defs.h:239:
+struct AcpiXsdtDescriptorRev2
+{

total: 1 errors, 0 warnings, 125 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 3/9: hw/virtio: fix vhost user fails to startup when MQ...
Checking PATCH 4/9: libvhost-user: fix crash when rings aren't ready...
Checking PATCH 5/9: pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot...
Checking PATCH 6/9: pc: add 2.10 machine type...
Checking PATCH 7/9: iommu: Don't crash if machine is not PC_MACHINE...
Checking PATCH 8/9: ACPI: don't call acpi_pcihp_device_plug_cb on xen...
Checking PATCH 9/9: acpi-defs: clean up open brace usage...
=== 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
Stefan Hajnoczi May 15, 2017, 12:58 p.m. UTC | #2
On Wed, May 10, 2017 at 10:07:58PM +0300, Michael S. Tsirkin wrote:
> The following changes since commit 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb:
> 
>   Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging (2017-05-09 15:49:14 -0400)
> 
> 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 8b12e48950a3d59188489b2ff6c5ad9cc09e9866:
> 
>   acpi-defs: clean up open brace usage (2017-05-10 22:04:23 +0300)
> 
> ----------------------------------------------------------------
> pci, virtio, vhost: fixes
> 
> A bunch of fixes that missed the release.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Please resend with the checkpatch.pl issue fixed.
Michael S. Tsirkin May 15, 2017, 1:04 p.m. UTC | #3
On Mon, May 15, 2017 at 01:58:40PM +0100, Stefan Hajnoczi wrote:
> On Wed, May 10, 2017 at 10:07:58PM +0300, Michael S. Tsirkin wrote:
> > The following changes since commit 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb:
> > 
> >   Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging (2017-05-09 15:49:14 -0400)
> > 
> > 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 8b12e48950a3d59188489b2ff6c5ad9cc09e9866:
> > 
> >   acpi-defs: clean up open brace usage (2017-05-10 22:04:23 +0300)
> > 
> > ----------------------------------------------------------------
> > pci, virtio, vhost: fixes
> > 
> > A bunch of fixes that missed the release.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> Please resend with the checkpatch.pl issue fixed.


There's no issue - new patch followed surrounding code which
was not refactored to match checkpatch.
Last patch of the series refactors all of that file to match.

We do not need to worry abut bisect for checkpatch issues IMHO.
Michael S. Tsirkin May 17, 2017, 9:40 p.m. UTC | #4
On Mon, May 15, 2017 at 04:04:33PM +0300, Michael S. Tsirkin wrote:
> On Mon, May 15, 2017 at 01:58:40PM +0100, Stefan Hajnoczi wrote:
> > On Wed, May 10, 2017 at 10:07:58PM +0300, Michael S. Tsirkin wrote:
> > > The following changes since commit 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb:
> > > 
> > >   Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging (2017-05-09 15:49:14 -0400)
> > > 
> > > 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 8b12e48950a3d59188489b2ff6c5ad9cc09e9866:
> > > 
> > >   acpi-defs: clean up open brace usage (2017-05-10 22:04:23 +0300)
> > > 
> > > ----------------------------------------------------------------
> > > pci, virtio, vhost: fixes
> > > 
> > > A bunch of fixes that missed the release.
> > > 
> > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > Please resend with the checkpatch.pl issue fixed.
> 
> 
> There's no issue - new patch followed surrounding code which
> was not refactored to match checkpatch.
> Last patch of the series refactors all of that file to match.
> 
> We do not need to worry abut bisect for checkpatch issues IMHO.

Ping - is this going to get merged? I'm preparing the next pull request
meanwhile ...

> -- 
> MST
Stefan Hajnoczi May 18, 2017, 9:02 a.m. UTC | #5
On Wed, May 10, 2017 at 10:07:58PM +0300, Michael S. Tsirkin wrote:
> The following changes since commit 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb:
> 
>   Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging (2017-05-09 15:49:14 -0400)
> 
> 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 8b12e48950a3d59188489b2ff6c5ad9cc09e9866:
> 
>   acpi-defs: clean up open brace usage (2017-05-10 22:04:23 +0300)
> 
> ----------------------------------------------------------------
> pci, virtio, vhost: fixes
> 
> A bunch of fixes that missed the release.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> ----------------------------------------------------------------
> Ard Biesheuvel (2):
>       hw/acpi-defs: replace leading X with x_ in FADT field names
>       hw/arm/virt: generate 64-bit addressable ACPI objects
> 
> Bruce Rogers (1):
>       ACPI: don't call acpi_pcihp_device_plug_cb on xen
> 
> Eduardo Habkost (1):
>       iommu: Don't crash if machine is not PC_MACHINE
> 
> Igor Mammedov (1):
>       pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot
> 
> Marc-André Lureau (1):
>       libvhost-user: fix crash when rings aren't ready
> 
> Michael S. Tsirkin (1):
>       acpi-defs: clean up open brace usage
> 
> Peter Xu (1):
>       pc: add 2.10 machine type
> 
> Zhiyong Yang (1):
>       hw/virtio: fix vhost user fails to startup when MQ
> 
>  contrib/libvhost-user/libvhost-user.h |  6 ++---
>  include/hw/acpi/acpi-defs.h           | 45 ++++++++++++++++++-----------------
>  include/hw/acpi/aml-build.h           |  3 +++
>  include/hw/i386/pc.h                  | 10 ++++----
>  contrib/libvhost-user/libvhost-user.c | 26 +++++++++++++++-----
>  hw/acpi/aml-build.c                   | 27 +++++++++++++++++++++
>  hw/acpi/piix4.c                       | 11 ++++++---
>  hw/arm/virt-acpi-build.c              | 26 ++++++++++----------
>  hw/i386/acpi-build.c                  |  4 ++--
>  hw/i386/amd_iommu.c                   | 15 +++++++++++-
>  hw/i386/intel_iommu.c                 | 14 +++++++++--
>  hw/i386/pc.c                          |  9 ++++---
>  hw/i386/pc_piix.c                     | 16 ++++++++++---
>  hw/i386/pc_q35.c                      | 14 +++++++++--
>  hw/virtio/vhost-user.c                | 21 +++++++++-------
>  tests/bios-tables-test.c              |  4 ++--
>  16 files changed, 175 insertions(+), 76 deletions(-)
> 
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan
Stefan Hajnoczi May 18, 2017, 9:02 a.m. UTC | #6
On Thu, May 18, 2017 at 12:40:01AM +0300, Michael S. Tsirkin wrote:
> On Mon, May 15, 2017 at 04:04:33PM +0300, Michael S. Tsirkin wrote:
> > On Mon, May 15, 2017 at 01:58:40PM +0100, Stefan Hajnoczi wrote:
> > > On Wed, May 10, 2017 at 10:07:58PM +0300, Michael S. Tsirkin wrote:
> > > > The following changes since commit 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb:
> > > > 
> > > >   Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging (2017-05-09 15:49:14 -0400)
> > > > 
> > > > 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 8b12e48950a3d59188489b2ff6c5ad9cc09e9866:
> > > > 
> > > >   acpi-defs: clean up open brace usage (2017-05-10 22:04:23 +0300)
> > > > 
> > > > ----------------------------------------------------------------
> > > > pci, virtio, vhost: fixes
> > > > 
> > > > A bunch of fixes that missed the release.
> > > > 
> > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > > 
> > > Please resend with the checkpatch.pl issue fixed.
> > 
> > 
> > There's no issue - new patch followed surrounding code which
> > was not refactored to match checkpatch.
> > Last patch of the series refactors all of that file to match.
> > 
> > We do not need to worry abut bisect for checkpatch issues IMHO.
> 
> Ping - is this going to get merged? I'm preparing the next pull request
> meanwhile ...

Sorry, I forgot about this one.  Applied now.

Stefan