[Qemu-devel] [PULL v2 00/14] virtio, pci, pc: cleanups, features

Michael S. Tsirkin posted 14 patches 6 years, 5 months ago
Only 2 patches received!
There is a newer version of this series
default-configs/i386-softmmu.mak      |   1 +
include/hw/acpi/acpi-defs.h           |  18 ------
include/hw/acpi/pci.h                 |   1 +
include/hw/pci/pci.h                  |   3 +-
include/hw/pci/pci_bus.h              |   8 ++-
include/hw/virtio/vhost-scsi-common.h |   1 +
tests/bios-tables-test-allowed-diff.h |   1 +
hw/acpi/pci.c                         |  61 ++++++++++++++++++++
hw/arm/virt-acpi-build.c              |  17 ------
hw/i386/acpi-build.c                  |  18 +-----
hw/pci-bridge/dec.c                   |   4 +-
hw/pci-bridge/i82801b11.c             |   2 +-
hw/pci-bridge/pci_bridge_dev.c        |   2 +-
hw/pci-bridge/pcie_pci_bridge.c       |   2 +-
hw/pci-bridge/pcie_root_port.c        |   2 +-
hw/pci-bridge/simba.c                 |   2 +-
hw/pci-bridge/xio3130_downstream.c    |   2 +-
hw/pci-bridge/xio3130_upstream.c      |   2 +-
hw/pci/pci.c                          | 101 +++++++++++++++++-----------------
hw/pci/pci_host.c                     |  13 +----
hw/ppc/spapr_pci.c                    |  34 ++++--------
hw/scsi/vhost-scsi.c                  |  57 +++++++++++++++----
hw/scsi/vhost-user-scsi.c             |   3 +
hw/virtio/vhost.c                     |   3 +-
tests/bios-tables-test.c              |  23 +++++++-
hw/acpi/Kconfig                       |   4 ++
hw/acpi/Makefile.objs                 |   1 +
hw/arm/Kconfig                        |   1 +
qemu-options.hx                       |   2 +-
29 files changed, 226 insertions(+), 163 deletions(-)
create mode 100644 tests/bios-tables-test-allowed-diff.h
create mode 100644 hw/acpi/pci.c
[Qemu-devel] [PULL v2 00/14] virtio, pci, pc: cleanups, features
Posted by Michael S. Tsirkin 6 years, 5 months ago
The following changes since commit 8c1ecb590497b0349c550607db923972b37f6963:

  Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-280519-2' into staging (2019-05-28 17:38:32 +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 df7cafdeb68b6572fa81d2be9a1910547c4dfafc:

  bios-tables-test: list all tables that differ (2019-06-03 08:05:43 -0400)

----------------------------------------------------------------
virtio, pci, pc: cleanups, features

stricter rules for acpi tables: we now fail
on any difference that isn't whitelisted.

vhost-scsi migration.

some cleanups all over the place

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

----------------------------------------------------------------
David Gibson (3):
      pcie: Simplify pci_adjust_config_limit()
      pci: Make is_bridge a bool
      pci: Fold pci_get_bus_devfn() into its sole caller

Igor Mammedov (1):
      docs: smbios: remove family=x from type2 entry description

Jie Wang (3):
      vhost: remove the dead code
      vhost: fix incorrect print type
      vhost: fix memory leak in vhost_user_scsi_realize

Liran Alon (1):
      vhost-scsi: Allow user to enable migration

Michael S. Tsirkin (2):
      bios-tables-test: add diff allowed list
      bios-tables-test: list all tables that differ

Nir Weiner (2):
      vhost-scsi: The vhost backend should be stopped when the VM is not running
      vhost-scsi: Add VMState descriptor

Wei Yang (2):
      hw/acpi: Consolidate build_mcfg to pci.c
      acpi: pci: use build_append_foo() API to construct MCFG

 default-configs/i386-softmmu.mak      |   1 +
 include/hw/acpi/acpi-defs.h           |  18 ------
 include/hw/acpi/pci.h                 |   1 +
 include/hw/pci/pci.h                  |   3 +-
 include/hw/pci/pci_bus.h              |   8 ++-
 include/hw/virtio/vhost-scsi-common.h |   1 +
 tests/bios-tables-test-allowed-diff.h |   1 +
 hw/acpi/pci.c                         |  61 ++++++++++++++++++++
 hw/arm/virt-acpi-build.c              |  17 ------
 hw/i386/acpi-build.c                  |  18 +-----
 hw/pci-bridge/dec.c                   |   4 +-
 hw/pci-bridge/i82801b11.c             |   2 +-
 hw/pci-bridge/pci_bridge_dev.c        |   2 +-
 hw/pci-bridge/pcie_pci_bridge.c       |   2 +-
 hw/pci-bridge/pcie_root_port.c        |   2 +-
 hw/pci-bridge/simba.c                 |   2 +-
 hw/pci-bridge/xio3130_downstream.c    |   2 +-
 hw/pci-bridge/xio3130_upstream.c      |   2 +-
 hw/pci/pci.c                          | 101 +++++++++++++++++-----------------
 hw/pci/pci_host.c                     |  13 +----
 hw/ppc/spapr_pci.c                    |  34 ++++--------
 hw/scsi/vhost-scsi.c                  |  57 +++++++++++++++----
 hw/scsi/vhost-user-scsi.c             |   3 +
 hw/virtio/vhost.c                     |   3 +-
 tests/bios-tables-test.c              |  23 +++++++-
 hw/acpi/Kconfig                       |   4 ++
 hw/acpi/Makefile.objs                 |   1 +
 hw/arm/Kconfig                        |   1 +
 qemu-options.hx                       |   2 +-
 29 files changed, 226 insertions(+), 163 deletions(-)
 create mode 100644 tests/bios-tables-test-allowed-diff.h
 create mode 100644 hw/acpi/pci.c


Re: [Qemu-devel] [PULL v2 00/14] virtio, pci, pc: cleanups, features
Posted by Peter Maydell 6 years, 5 months ago
On Mon, 3 Jun 2019 at 19:08, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> The following changes since commit 8c1ecb590497b0349c550607db923972b37f6963:
>
>   Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-280519-2' into staging (2019-05-28 17:38:32 +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 df7cafdeb68b6572fa81d2be9a1910547c4dfafc:
>
>   bios-tables-test: list all tables that differ (2019-06-03 08:05:43 -0400)
>
> ----------------------------------------------------------------
> virtio, pci, pc: cleanups, features
>
> stricter rules for acpi tables: we now fail
> on any difference that isn't whitelisted.
>
> vhost-scsi migration.
>
> some cleanups all over the place
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------


Hi; I'm afraid this fails 'make check' on my aarch32 build:

MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=i386-softmmu/qemu-system-i386
QTEST_QEMU_IMG=qemu-img tests/bios-tables-test -m=quick -k --tap <
/dev/null | ./scripts/tap-driver.pl --test-name="bios-tables-test"

Looking for expected file 'tests/data/acpi/pc/FACP'
Using expected file 'tests/data/acpi/pc/FACP'
Looking for expected file 'tests/data/acpi/pc/APIC'
Using expected file 'tests/data/acpi/pc/APIC'
Looking for expected file 'tests/data/acpi/pc/HPET'
Using expected file 'tests/data/acpi/pc/HPET'
Looking for expected file 'tests/data/acpi/pc/FACS'
Using expected file 'tests/data/acpi/pc/FACS'
Looking for expected file 'tests/data/acpi/pc/DSDT'
Using expected file 'tests/data/acpi/pc/DSDT'
PASS 1 bios-tables-test /i386/acpi/piix4

Looking for expected file 'tests/data/acpi/q35/FACP'
Using expected file 'tests/data/acpi/q35/FACP'
Looking for expected file 'tests/data/acpi/q35/APIC'
Using expected file 'tests/data/acpi/q35/APIC'
Looking for expected file 'tests/data/acpi/q35/HPET'
Using expected file 'tests/data/acpi/q35/HPET'
Looking for expected file 'tests/data/acpi/q35/MCFG'
Using expected file 'tests/data/acpi/q35/MCFG'
Looking for expected file 'tests/data/acpi/q35/FACS'
Using expected file 'tests/data/acpi/q35/FACS'
Looking for expected file 'tests/data/acpi/q35/DSDT'
Using expected file 'tests/data/acpi/q35/DSDT'
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-NKUU2Z.dsl,
aml:/tmp/aml-UERV2Z], Expected [asl:/tmp/asl-3ITW2Z.dsl,
aml:tests/data/acpi/q35/DSDT].
acpi-test: Warning. not showing difference since no diff utility is
specified. Set 'DIFF' environment variable to a preferred diff utility
and run 'make V=1 check' again to see ASL difference.**
ERROR:/home/peter.maydell/qemu/tests/bios-tables-test.c:422:test_acpi_asl:
assertion failed: (all_tables_match)
Aborted
ERROR - too few tests run (expected 15, got 1)
/home/peter.maydell/qemu/tests/Makefile.include:884: recipe for target
'check-qtest-i386' failed


This is the only 32-bit host I test on, so it may be a generic
32-bit host problem rather than arm-specific.

thanks
-- PMM

Re: [Qemu-devel] [PULL v2 00/14] virtio, pci, pc: cleanups, features
Posted by Michael S. Tsirkin 6 years, 5 months ago
On Tue, Jun 04, 2019 at 04:57:00PM +0100, Peter Maydell wrote:
> On Mon, 3 Jun 2019 at 19:08, Michael S. Tsirkin <mst@redhat.com> wrote:
> >
> > The following changes since commit 8c1ecb590497b0349c550607db923972b37f6963:
> >
> >   Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-280519-2' into staging (2019-05-28 17:38:32 +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 df7cafdeb68b6572fa81d2be9a1910547c4dfafc:
> >
> >   bios-tables-test: list all tables that differ (2019-06-03 08:05:43 -0400)
> >
> > ----------------------------------------------------------------
> > virtio, pci, pc: cleanups, features
> >
> > stricter rules for acpi tables: we now fail
> > on any difference that isn't whitelisted.
> >
> > vhost-scsi migration.
> >
> > some cleanups all over the place
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > ----------------------------------------------------------------
> 
> 
> Hi; I'm afraid this fails 'make check' on my aarch32 build:
> 
> MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
> QTEST_QEMU_BINARY=i386-softmmu/qemu-system-i386
> QTEST_QEMU_IMG=qemu-img tests/bios-tables-test -m=quick -k --tap <
> /dev/null | ./scripts/tap-driver.pl --test-name="bios-tables-test"
> 
> Looking for expected file 'tests/data/acpi/pc/FACP'
> Using expected file 'tests/data/acpi/pc/FACP'
> Looking for expected file 'tests/data/acpi/pc/APIC'
> Using expected file 'tests/data/acpi/pc/APIC'
> Looking for expected file 'tests/data/acpi/pc/HPET'
> Using expected file 'tests/data/acpi/pc/HPET'
> Looking for expected file 'tests/data/acpi/pc/FACS'
> Using expected file 'tests/data/acpi/pc/FACS'
> Looking for expected file 'tests/data/acpi/pc/DSDT'
> Using expected file 'tests/data/acpi/pc/DSDT'
> PASS 1 bios-tables-test /i386/acpi/piix4
> 
> Looking for expected file 'tests/data/acpi/q35/FACP'
> Using expected file 'tests/data/acpi/q35/FACP'
> Looking for expected file 'tests/data/acpi/q35/APIC'
> Using expected file 'tests/data/acpi/q35/APIC'
> Looking for expected file 'tests/data/acpi/q35/HPET'
> Using expected file 'tests/data/acpi/q35/HPET'
> Looking for expected file 'tests/data/acpi/q35/MCFG'
> Using expected file 'tests/data/acpi/q35/MCFG'
> Looking for expected file 'tests/data/acpi/q35/FACS'
> Using expected file 'tests/data/acpi/q35/FACS'
> Looking for expected file 'tests/data/acpi/q35/DSDT'
> Using expected file 'tests/data/acpi/q35/DSDT'
> acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-NKUU2Z.dsl,
> aml:/tmp/aml-UERV2Z], Expected [asl:/tmp/asl-3ITW2Z.dsl,
> aml:tests/data/acpi/q35/DSDT].
> acpi-test: Warning. not showing difference since no diff utility is
> specified. Set 'DIFF' environment variable to a preferred diff utility
> and run 'make V=1 check' again to see ASL difference.**
> ERROR:/home/peter.maydell/qemu/tests/bios-tables-test.c:422:test_acpi_asl:
> assertion failed: (all_tables_match)
> Aborted
> ERROR - too few tests run (expected 15, got 1)
> /home/peter.maydell/qemu/tests/Makefile.include:884: recipe for target
> 'check-qtest-i386' failed
> 
> 
> This is the only 32-bit host I test on, so it may be a generic
> 32-bit host problem rather than arm-specific.
> 
> thanks
> -- PMM

I see. I can drop this patch for now, but I suspect this
means this host always produced warning and possibly
that the tables are all wrong.
Could you send me the actual and expected files please?
Preferably both dsl and binary.

-- 
MST

Re: [Qemu-devel] [PULL v2 00/14] virtio, pci, pc: cleanups, features
Posted by Peter Maydell 6 years, 5 months ago
On Tue, 4 Jun 2019 at 17:48, Michael S. Tsirkin <mst@redhat.com> wrote:
> I see. I can drop this patch for now, but I suspect this
> means this host always produced warning and possibly
> that the tables are all wrong.
> Could you send me the actual and expected files please?
> Preferably both dsl and binary.

Sure, if you can give me commands to run to do that.

thanks
-- PMM

Re: [Qemu-devel] [PULL v2 00/14] virtio, pci, pc: cleanups, features
Posted by Michael S. Tsirkin 6 years, 5 months ago
On Tue, Jun 04, 2019 at 05:55:36PM +0100, Peter Maydell wrote:
> On Tue, 4 Jun 2019 at 17:48, Michael S. Tsirkin <mst@redhat.com> wrote:
> > I see. I can drop this patch for now, but I suspect this
> > means this host always produced warning and possibly
> > that the tables are all wrong.
> > Could you send me the actual and expected files please?
> > Preferably both dsl and binary.
> 
> Sure, if you can give me commands to run to do that.
> 
> thanks
> -- PMM

They are produced as part of the test.

So we have:
acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-NKUU2Z.dsl,
aml:/tmp/aml-UERV2Z], Expected [asl:/tmp/asl-3ITW2Z.dsl,
aml:tests/data/acpi/q35/DSDT].

You would do something like:

tar cvzf tests.tgz /tmp/asl-NKUU2Z.dsl /tmp/aml-UERV2Z /tmp/asl-3ITW2Z.dsl tests/data/acpi/q35/DSDT

And then send the tarball.

-- 
MST