[Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes

Michael S. Tsirkin posted 13 patches 8 years, 8 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1495057396-13387-1-git-send-email-mst@redhat.com
Test checkpatch failed
Test docker passed
Test s390x passed
contrib/libvhost-user/libvhost-user.h |   6 +-
include/hw/acpi/acpi-defs.h           |  45 +++++++--------
include/hw/acpi/aml-build.h           |   3 +
include/hw/compat.h                   |   6 +-
include/hw/i386/pc.h                  |  10 ++--
contrib/libvhost-user/libvhost-user.c |  26 +++++++--
exec.c                                | 103 +++++++++++++++++++++++-----------
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/pci-bridge/pci_bridge_dev.c        |   2 +-
hw/pci/pci.c                          |   1 +
hw/virtio/vhost-user.c                |  21 ++++---
hw/virtio/virtio.c                    |   4 +-
tests/bios-tables-test.c              |   4 +-
21 files changed, 253 insertions(+), 114 deletions(-)
[Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes
Posted by Michael S. Tsirkin 8 years, 8 months ago
This includes the previous pull request which still
does not appear to be in - not rebased so merging twice
will not cause conflicts. Note that patch 08 makes checkpatch
complain, patch 9 fixes that.

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 a764040cc831cfe5b8bf1c80e8341b9bf2de3ce8:

  exec: abstract address_space_do_translate() (2017-05-18 00:35:15 +0300)

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

A bunch of fixes that missed the release.
Most notably we are reverting shpc back to enabled by default state
as guests uses that as an indicator that hotplug is supported
(even though it's unused). Unfortunately we can't fix this
on the stable branch since that would break migration.

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

Greg Kurz (1):
      virtio: allow broken device to notify guest

Herongguang (Stephen) (1):
      pci: deassert intx when pci device unrealize

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

Marcel Apfelbaum (1):
      Revert "hw/pci: disable pci-bridge's shpc by default"

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

Peter Xu (2):
      pc: add 2.10 machine type
      exec: abstract address_space_do_translate()

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/compat.h                   |   6 +-
 include/hw/i386/pc.h                  |  10 ++--
 contrib/libvhost-user/libvhost-user.c |  26 +++++++--
 exec.c                                | 103 +++++++++++++++++++++++-----------
 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/pci-bridge/pci_bridge_dev.c        |   2 +-
 hw/pci/pci.c                          |   1 +
 hw/virtio/vhost-user.c                |  21 ++++---
 hw/virtio/virtio.c                    |   4 +-
 tests/bios-tables-test.c              |   4 +-
 21 files changed, 253 insertions(+), 114 deletions(-)


Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes
Posted by no-reply@patchew.org 8 years, 8 months ago
Hi,

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

Message-id: 1495057396-13387-1-git-send-email-mst@redhat.com
Subject: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes
Type: series

=== 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'
17bfbca exec: abstract address_space_do_translate()
8bb02e7 pci: deassert intx when pci device unrealize
1e14278 virtio: allow broken device to notify guest
dc29a74 Revert "hw/pci: disable pci-bridge's shpc by default"
3398123 acpi-defs: clean up open brace usage
c25b309 ACPI: don't call acpi_pcihp_device_plug_cb on xen
02d833c iommu: Don't crash if machine is not PC_MACHINE
013b6f7 pc: add 2.10 machine type
f8df4b9 pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot
39fbfab libvhost-user: fix crash when rings aren't ready
1b9f61d hw/virtio: fix vhost user fails to startup when MQ
e03f60a hw/arm/virt: generate 64-bit addressable ACPI objects
6fc4238 hw/acpi-defs: replace leading X with x_ in FADT field names

=== OUTPUT BEGIN ===
Checking PATCH 1/13: hw/acpi-defs: replace leading X with x_ in FADT field names...
Checking PATCH 2/13: 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/13: hw/virtio: fix vhost user fails to startup when MQ...
Checking PATCH 4/13: libvhost-user: fix crash when rings aren't ready...
Checking PATCH 5/13: pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot...
Checking PATCH 6/13: pc: add 2.10 machine type...
Checking PATCH 7/13: iommu: Don't crash if machine is not PC_MACHINE...
Checking PATCH 8/13: ACPI: don't call acpi_pcihp_device_plug_cb on xen...
Checking PATCH 9/13: acpi-defs: clean up open brace usage...
Checking PATCH 10/13: Revert "hw/pci: disable pci-bridge's shpc by default"...
Checking PATCH 11/13: virtio: allow broken device to notify guest...
Checking PATCH 12/13: pci: deassert intx when pci device unrealize...
Checking PATCH 13/13: exec: abstract address_space_do_translate()...
WARNING: line over 80 characters
#46: FILE: exec.c:479:
+        section = address_space_translate_internal(d, addr, &addr, plen, is_mmio);

total: 0 errors, 1 warnings, 142 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.
=== 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
Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes
Posted by Michael S. Tsirkin 8 years, 8 months ago
On Wed, May 17, 2017 at 03:29:33PM -0700, no-reply@patchew.org wrote:
> Hi,
> 
> This series seems to have some coding style problems. See output below for
> more information:
> 
> Message-id: 1495057396-13387-1-git-send-email-mst@redhat.com
> Subject: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes
> Type: series
> 
> === 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'
> 17bfbca exec: abstract address_space_do_translate()
> 8bb02e7 pci: deassert intx when pci device unrealize
> 1e14278 virtio: allow broken device to notify guest
> dc29a74 Revert "hw/pci: disable pci-bridge's shpc by default"
> 3398123 acpi-defs: clean up open brace usage
> c25b309 ACPI: don't call acpi_pcihp_device_plug_cb on xen
> 02d833c iommu: Don't crash if machine is not PC_MACHINE
> 013b6f7 pc: add 2.10 machine type
> f8df4b9 pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot
> 39fbfab libvhost-user: fix crash when rings aren't ready
> 1b9f61d hw/virtio: fix vhost user fails to startup when MQ
> e03f60a hw/arm/virt: generate 64-bit addressable ACPI objects
> 6fc4238 hw/acpi-defs: replace leading X with x_ in FADT field names
> 
> === OUTPUT BEGIN ===
> Checking PATCH 1/13: hw/acpi-defs: replace leading X with x_ in FADT field names...
> Checking PATCH 2/13: 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/13: hw/virtio: fix vhost user fails to startup when MQ...
> Checking PATCH 4/13: libvhost-user: fix crash when rings aren't ready...
> Checking PATCH 5/13: pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot...
> Checking PATCH 6/13: pc: add 2.10 machine type...
> Checking PATCH 7/13: iommu: Don't crash if machine is not PC_MACHINE...
> Checking PATCH 8/13: ACPI: don't call acpi_pcihp_device_plug_cb on xen...
> Checking PATCH 9/13: acpi-defs: clean up open brace usage...
> Checking PATCH 10/13: Revert "hw/pci: disable pci-bridge's shpc by default"...
> Checking PATCH 11/13: virtio: allow broken device to notify guest...
> Checking PATCH 12/13: pci: deassert intx when pci device unrealize...
> Checking PATCH 13/13: exec: abstract address_space_do_translate()...
> WARNING: line over 80 characters
> #46: FILE: exec.c:479:
> +        section = address_space_translate_internal(d, addr, &addr, plen, is_mmio);
> 
> total: 0 errors, 1 warnings, 142 lines checked

Not by a lot, and seems much clearer this way, so I think it's ok to ignore.

> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> === 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

Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes
Posted by Stefan Hajnoczi 8 years, 8 months ago
On Thu, May 18, 2017 at 12:44:59AM +0300, Michael S. Tsirkin wrote:
> This includes the previous pull request which still
> does not appear to be in - not rebased so merging twice
> will not cause conflicts. Note that patch 08 makes checkpatch
> complain, patch 9 fixes that.
> 
> 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 a764040cc831cfe5b8bf1c80e8341b9bf2de3ce8:
> 
>   exec: abstract address_space_do_translate() (2017-05-18 00:35:15 +0300)
> 
> ----------------------------------------------------------------
> pci, virtio, vhost: fixes
> 
> A bunch of fixes that missed the release.
> Most notably we are reverting shpc back to enabled by default state
> as guests uses that as an indicator that hotplug is supported
> (even though it's unused). Unfortunately we can't fix this
> on the stable branch since that would break migration.
> 
> 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
> 
> Greg Kurz (1):
>       virtio: allow broken device to notify guest
> 
> Herongguang (Stephen) (1):
>       pci: deassert intx when pci device unrealize
> 
> 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
> 
> Marcel Apfelbaum (1):
>       Revert "hw/pci: disable pci-bridge's shpc by default"
> 
> Michael S. Tsirkin (1):
>       acpi-defs: clean up open brace usage
> 
> Peter Xu (2):
>       pc: add 2.10 machine type
>       exec: abstract address_space_do_translate()
> 
> 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/compat.h                   |   6 +-
>  include/hw/i386/pc.h                  |  10 ++--
>  contrib/libvhost-user/libvhost-user.c |  26 +++++++--
>  exec.c                                | 103 +++++++++++++++++++++++-----------
>  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/pci-bridge/pci_bridge_dev.c        |   2 +-
>  hw/pci/pci.c                          |   1 +
>  hw/virtio/vhost-user.c                |  21 ++++---
>  hw/virtio/virtio.c                    |   4 +-
>  tests/bios-tables-test.c              |   4 +-
>  21 files changed, 253 insertions(+), 114 deletions(-)
> 
> 

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

Stefan