[Qemu-devel] [PULL 0/8] pci, virtio, vhost: fixes

Michael S. Tsirkin posted 8 patches 6 years, 11 months ago
Failed in applying to current master (apply log)
Test checkpatch failed
Test docker passed
Test s390x passed
contrib/libvhost-user/libvhost-user.h |  6 +++---
include/hw/acpi/acpi-defs.h           | 15 +++++++++++++--
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/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 +++++++++++++--------
14 files changed, 161 insertions(+), 52 deletions(-)
[Qemu-devel] [PULL 0/8] pci, virtio, vhost: fixes
Posted by Michael S. Tsirkin 6 years, 11 months ago
The following changes since commit dd1559bb267becbb838de41132ef60771d183e5d:

  Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging (2017-05-05 17:07:55 +0100)

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 6512fee18a330463f7cbe2524d92a53252664946:

  ACPI: don't call acpi_pcihp_device_plug_cb on xen (2017-05-09 14:45:55 +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

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           | 15 +++++++++++++--
 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/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 +++++++++++++--------
 14 files changed, 161 insertions(+), 52 deletions(-)


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

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

Subject: [Qemu-devel] [PULL 0/8] pci, virtio, vhost: fixes
Type: series
Message-id: 1494330527-24163-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'
1aaf234 ACPI: don't call acpi_pcihp_device_plug_cb on xen
3b6e1b3 iommu: Don't crash if machine is not PC_MACHINE
5e3f027 pc: add 2.10 machine type
a611b9d pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot
2ece0f6 libvhost-user: fix crash when rings aren't ready
c9d2f84 hw/virtio: fix vhost user fails to startup when MQ
f24260b hw/arm/virt: generate 64-bit addressable ACPI objects
6f01b84 hw/acpi-defs: replace leading X with x_ in FADT field names

=== OUTPUT BEGIN ===
Checking PATCH 1/8: hw/acpi-defs: replace leading X with x_ in FADT field names...
Checking PATCH 2/8: 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:244:
+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/8: hw/virtio: fix vhost user fails to startup when MQ...
Checking PATCH 4/8: libvhost-user: fix crash when rings aren't ready...
Checking PATCH 5/8: pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot...
Checking PATCH 6/8: pc: add 2.10 machine type...
Checking PATCH 7/8: iommu: Don't crash if machine is not PC_MACHINE...
Checking PATCH 8/8: ACPI: don't call acpi_pcihp_device_plug_cb on xen...
=== 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 0/8] pci, virtio, vhost: fixes
Posted by Michael S. Tsirkin 6 years, 11 months ago
On Tue, May 09, 2017 at 08:45:35AM -0700, no-reply@patchew.org wrote:
> Hi,
> 
> This series seems to have some coding style problems. See output below for
> more information:
> 
> Subject: [Qemu-devel] [PULL 0/8] pci, virtio, vhost: fixes
> Type: series
> Message-id: 1494330527-24163-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'
> 1aaf234 ACPI: don't call acpi_pcihp_device_plug_cb on xen
> 3b6e1b3 iommu: Don't crash if machine is not PC_MACHINE
> 5e3f027 pc: add 2.10 machine type
> a611b9d pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot
> 2ece0f6 libvhost-user: fix crash when rings aren't ready
> c9d2f84 hw/virtio: fix vhost user fails to startup when MQ
> f24260b hw/arm/virt: generate 64-bit addressable ACPI objects
> 6f01b84 hw/acpi-defs: replace leading X with x_ in FADT field names
> 
> === OUTPUT BEGIN ===
> Checking PATCH 1/8: hw/acpi-defs: replace leading X with x_ in FADT field names...
> Checking PATCH 2/8: 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:244:
> +struct AcpiXsdtDescriptorRev2
> +{
> 
> total: 1 errors, 0 warnings, 125 lines checked

Yes but it's consistent with Rev1. So I'll keep it as is
and apply a tweak on top.

> 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/8: hw/virtio: fix vhost user fails to startup when MQ...
> Checking PATCH 4/8: libvhost-user: fix crash when rings aren't ready...
> Checking PATCH 5/8: pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot...
> Checking PATCH 6/8: pc: add 2.10 machine type...
> Checking PATCH 7/8: iommu: Don't crash if machine is not PC_MACHINE...
> Checking PATCH 8/8: ACPI: don't call acpi_pcihp_device_plug_cb on xen...
> === 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 0/8] pci, virtio, vhost: fixes
Posted by Stefan Hajnoczi 6 years, 11 months ago
On Tue, May 09, 2017 at 04:15:22PM +0300, Michael S. Tsirkin wrote:
> The following changes since commit dd1559bb267becbb838de41132ef60771d183e5d:
> 
>   Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging (2017-05-05 17:07:55 +0100)
> 
> 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 6512fee18a330463f7cbe2524d92a53252664946:
> 
>   ACPI: don't call acpi_pcihp_device_plug_cb on xen (2017-05-09 14:45:55 +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

Please rebase on qemu.git/master.  The following new commit conflicts:

  commit 77af8a2b95b79699de650965d5228772743efe84
  Author: Phil Dennis-Jordan <phil@philjordan.eu>
  Date:   Wed Mar 15 19:20:26 2017 +1300

      hw/i386: Use Rev3 FADT (ACPI 2.0) instead of Rev1 to improve guest OS support.