[v2] pci, pc, virtio: fixes, features

[Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features

Posted by Michael S. Tsirkin 6 years, 10 months ago

Changes from v1:
    Drop
        intel_iommu: turn on IR by default

The following changes since commit f163448536e5f7ae8905b14547eab37a41a75f6c:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20181216' into staging (2018-12-17 13:04:25 +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 d4ea2be7e8718ad6c1e5810bee6bdf5a0b8f31b8:

  hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 (2018-12-18 11:09:02 -0500)

----------------------------------------------------------------
pci, pc, virtio: fixes, features

VTD fixes
ACPI refactoring
new names for virtio devices
multiple pcie link width/speeds

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

----------------------------------------------------------------
Alex Williamson (8):
      pcie: Create enums for link speed and width
      pci: Sync PCIe downstream port LNKSTA on read
      qapi: Define PCIe link speed and width properties
      pcie: Add link speed and width fields to PCIESlot
      pcie: Fill PCIESlot link fields to support higher speeds and widths
      pcie: Allow generic PCIe root port to specify link speed and width
      vfio/pci: Remove PCIe Link Status emulation
      pcie: Fast PCIe root ports for new machines

Corey Minyard (1):
      pc:piix4: Update smbus I/O space after a migration

Eduardo Habkost (2):
      virtio: Helper for registering virtio device types
      virtio: Provide version-specific variants of virtio PCI devices

Igor Mammedov (2):
      hw: arm: acpi: Fix incorrect checksums in RSDP
      hw: i386: Use correct RSDT length for checksum

Matthias Weckbecker (1):
      hw/pci-bridge: Fix invalid free()

Peter Xu (4):
      intel_iommu: dump correct iova when failed
      intel_iommu: convert invalid traces into error reports
      intel_iommu: dma read/write draining support
      intel_iommu: remove "x-" prefix for "aw-bits"

Philippe Mathieu-Daudé (4):
      tests: Remove unused include
      hw/smbios: Restrict access to "hw/smbios/ipmi.h"
      hw/smbios: Remove "smbios_ipmi.h"
      hw/smbios: Move to the hw/firmware/ subdirectory

Samuel Ortiz (6):
      hw: acpi: The RSDP build API can return void
      hw: arm: Carry RSDP specific data through AcpiRsdpData
      hw: arm: Convert the RSDP build to the buid_append_foo() API
      hw: arm: Support both legacy and current RSDP build
      hw: acpi: Export and share the ARM RSDP build
      hw: acpi: Remove AcpiRsdpDescriptor and fix tests

Thomas Huth (1):
      hw/i386: Remove deprecated machines pc-0.10 and pc-0.11

Zheng Xiang (1):
      pcie: set link state inactive/active after hot unplug/plug

 qapi/common.json                         |  42 +++++
 hw/i386/intel_iommu_internal.h           |   3 +
 hw/smbios/smbios_build.h                 |   4 +
 hw/virtio/virtio-pci.h                   |  78 +++++++--
 include/hw/acpi/acpi-defs.h              |  19 +--
 include/hw/acpi/aml-build.h              |   2 +
 include/hw/compat.h                      |  10 +-
 include/hw/{smbios => firmware}/smbios.h |   0
 include/hw/i386/intel_iommu.h            |   1 +
 include/hw/i386/pc.h                     |   5 +
 include/hw/pci/pci.h                     |  13 ++
 include/hw/pci/pcie.h                    |   1 +
 include/hw/pci/pcie_port.h               |   4 +
 include/hw/pci/pcie_regs.h               |  23 ++-
 include/hw/qdev-properties.h             |   8 +
 include/hw/smbios/ipmi.h                 |  15 --
 tests/acpi-utils.h                       |   4 +-
 hw/acpi/aml-build.c                      |  68 ++++++++
 hw/acpi/piix4.c                          |   1 +
 hw/arm/virt-acpi-build.c                 |  40 +----
 hw/arm/virt.c                            |   2 +-
 hw/core/qdev-properties.c                | 176 ++++++++++++++++++++
 hw/display/virtio-gpu-pci.c              |   7 +-
 hw/display/virtio-vga.c                  |   7 +-
 hw/i386/acpi-build.c                     |  46 +++---
 hw/i386/intel_iommu.c                    |  66 ++++++--
 hw/i386/pc.c                             |   2 +-
 hw/i386/pc_piix.c                        |  72 +-------
 hw/i386/pc_q35.c                         |   2 +-
 hw/pci-bridge/gen_pcie_root_port.c       |   4 +
 hw/pci-bridge/pcie_root_port.c           |  14 ++
 hw/pci/pci.c                             |   4 +
 hw/pci/pci_bridge.c                      |   2 +-
 hw/pci/pcie.c                            | 132 ++++++++++++++-
 hw/smbios/smbios-stub.c                  |   2 +-
 hw/smbios/smbios.c                       |   3 +-
 hw/smbios/smbios_type_38-stub.c          |   2 +-
 hw/smbios/smbios_type_38.c               |   3 +-
 hw/vfio/pci.c                            |   9 +-
 hw/virtio/virtio-crypto-pci.c            |   7 +-
 hw/virtio/virtio-pci.c                   | 271 +++++++++++++++++++++++--------
 tests/acpi-utils.c                       |  47 +++++-
 tests/bios-tables-test.c                 |  24 ++-
 tests/cpu-plug-test.c                    |   4 +-
 tests/vmgenid-test.c                     |   8 +-
 vl.c                                     |   2 +-
 MAINTAINERS                              |   2 +-
 hw/i386/trace-events                     |   6 -
 qemu-deprecated.texi                     |   2 +-
 tests/acceptance/virtio_version.py       | 176 ++++++++++++++++++++
 50 files changed, 1128 insertions(+), 317 deletions(-)
 rename include/hw/{smbios => firmware}/smbios.h (100%)
 delete mode 100644 include/hw/smbios/ipmi.h
 create mode 100644 tests/acceptance/virtio_version.py

Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features

Posted by Peter Maydell 6 years, 10 months ago

On Tue, 18 Dec 2018 at 16:11, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> Changes from v1:
>     Drop
>         intel_iommu: turn on IR by default
>
> The following changes since commit f163448536e5f7ae8905b14547eab37a41a75f6c:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20181216' into staging (2018-12-17 13:04:25 +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 d4ea2be7e8718ad6c1e5810bee6bdf5a0b8f31b8:
>
>   hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 (2018-12-18 11:09:02 -0500)
>
> ----------------------------------------------------------------
> pci, pc, virtio: fixes, features
>
> VTD fixes
> ACPI refactoring
> new names for virtio devices
> multiple pcie link width/speeds
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Hi; I'm afraid I get conflicts in some files which look
too complicated for me to want to try to resolve at this end:
Auto-merging tests/vmgenid-test.c
CONFLICT (content): Merge conflict in tests/vmgenid-test.c
Auto-merging tests/bios-tables-test.c
CONFLICT (content): Merge conflict in tests/bios-tables-test.c
Auto-merging tests/acpi-utils.h
CONFLICT (content): Merge conflict in tests/acpi-utils.h
Auto-merging tests/acpi-utils.c
CONFLICT (content): Merge conflict in tests/acpi-utils.c
Removing include/hw/smbios/ipmi.h

Please can you rebase and resend?

thanks
-- PMM

Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features

Posted by Igor Mammedov 6 years, 10 months ago

On Wed, 19 Dec 2018 19:15:26 +0000
Peter Maydell <peter.maydell@linaro.org> wrote:

> On Tue, 18 Dec 2018 at 16:11, Michael S. Tsirkin <mst@redhat.com> wrote:
> >
> > Changes from v1:
> >     Drop
> >         intel_iommu: turn on IR by default
> >
> > The following changes since commit f163448536e5f7ae8905b14547eab37a41a75f6c:
> >
> >   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20181216' into staging (2018-12-17 13:04:25 +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 d4ea2be7e8718ad6c1e5810bee6bdf5a0b8f31b8:
> >
> >   hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 (2018-12-18 11:09:02 -0500)
> >
> > ----------------------------------------------------------------
> > pci, pc, virtio: fixes, features
> >
> > VTD fixes
> > ACPI refactoring
> > new names for virtio devices
> > multiple pcie link width/speeds
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> Hi; I'm afraid I get conflicts in some files which look
> too complicated for me to want to try to resolve at this end:
> Auto-merging tests/vmgenid-test.c
> CONFLICT (content): Merge conflict in tests/vmgenid-test.c
> Auto-merging tests/bios-tables-test.c
> CONFLICT (content): Merge conflict in tests/bios-tables-test.c
> Auto-merging tests/acpi-utils.h
> CONFLICT (content): Merge conflict in tests/acpi-utils.h
> Auto-merging tests/acpi-utils.c
> CONFLICT (content): Merge conflict in tests/acpi-utils.c
> Removing include/hw/smbios/ipmi.h

I'm working on fixing conflicts due to 29/30 and will include conflicting patch in my acpi tests cleanup on respin

Meanwhile could you drop 29/30 and apply the rest of pull request (which applies just fine)?

> 
> Please can you rebase and resend?
> 
> thanks
> -- PMM
>

Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features

Posted by Peter Maydell 6 years, 10 months ago

On Thu, 20 Dec 2018 at 14:50, Igor Mammedov <imammedo@redhat.com> wrote:
>
> On Wed, 19 Dec 2018 19:15:26 +0000
> Peter Maydell <peter.maydell@linaro.org> wrote:
> > Hi; I'm afraid I get conflicts in some files which look
> > too complicated for me to want to try to resolve at this end:
> > Auto-merging tests/vmgenid-test.c
> > CONFLICT (content): Merge conflict in tests/vmgenid-test.c
> > Auto-merging tests/bios-tables-test.c
> > CONFLICT (content): Merge conflict in tests/bios-tables-test.c
> > Auto-merging tests/acpi-utils.h
> > CONFLICT (content): Merge conflict in tests/acpi-utils.h
> > Auto-merging tests/acpi-utils.c
> > CONFLICT (content): Merge conflict in tests/acpi-utils.c
> > Removing include/hw/smbios/ipmi.h
>
> I'm working on fixing conflicts due to 29/30 and will include conflicting patch in my acpi tests cleanup on respin
>
> Meanwhile could you drop 29/30 and apply the rest of pull request (which applies just fine)?

I can't apply a partial pull request -- MST will need to
drop those patches and send a v2.

thanks
-- PMM

Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features

Posted by Igor Mammedov 6 years, 10 months ago

On Thu, 20 Dec 2018 14:52:49 +0000
Peter Maydell <peter.maydell@linaro.org> wrote:

> On Thu, 20 Dec 2018 at 14:50, Igor Mammedov <imammedo@redhat.com> wrote:
> >
> > On Wed, 19 Dec 2018 19:15:26 +0000
> > Peter Maydell <peter.maydell@linaro.org> wrote:
> > > Hi; I'm afraid I get conflicts in some files which look
> > > too complicated for me to want to try to resolve at this end:
> > > Auto-merging tests/vmgenid-test.c
> > > CONFLICT (content): Merge conflict in tests/vmgenid-test.c
> > > Auto-merging tests/bios-tables-test.c
> > > CONFLICT (content): Merge conflict in tests/bios-tables-test.c
> > > Auto-merging tests/acpi-utils.h
> > > CONFLICT (content): Merge conflict in tests/acpi-utils.h
> > > Auto-merging tests/acpi-utils.c
> > > CONFLICT (content): Merge conflict in tests/acpi-utils.c
> > > Removing include/hw/smbios/ipmi.h
> >
> > I'm working on fixing conflicts due to 29/30 and will include conflicting patch in my acpi tests cleanup on respin
> >
> > Meanwhile could you drop 29/30 and apply the rest of pull request (which applies just fine)?
> 
> I can't apply a partial pull request -- MST will need to
> drop those patches and send a v2.

ok
I'll post fixed  up patch here for MST to pick it up

PS:
/me need to learn how to do pull requests


> 
> thanks
> -- PMM

Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features

Posted by Michael S. Tsirkin 6 years, 10 months ago

On Thu, Dec 20, 2018 at 03:49:59PM +0100, Igor Mammedov wrote:
> On Wed, 19 Dec 2018 19:15:26 +0000
> Peter Maydell <peter.maydell@linaro.org> wrote:
> 
> > On Tue, 18 Dec 2018 at 16:11, Michael S. Tsirkin <mst@redhat.com> wrote:
> > >
> > > Changes from v1:
> > >     Drop
> > >         intel_iommu: turn on IR by default
> > >
> > > The following changes since commit f163448536e5f7ae8905b14547eab37a41a75f6c:
> > >
> > >   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20181216' into staging (2018-12-17 13:04:25 +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 d4ea2be7e8718ad6c1e5810bee6bdf5a0b8f31b8:
> > >
> > >   hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 (2018-12-18 11:09:02 -0500)
> > >
> > > ----------------------------------------------------------------
> > > pci, pc, virtio: fixes, features
> > >
> > > VTD fixes
> > > ACPI refactoring
> > > new names for virtio devices
> > > multiple pcie link width/speeds
> > >
> > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > Hi; I'm afraid I get conflicts in some files which look
> > too complicated for me to want to try to resolve at this end:
> > Auto-merging tests/vmgenid-test.c
> > CONFLICT (content): Merge conflict in tests/vmgenid-test.c
> > Auto-merging tests/bios-tables-test.c
> > CONFLICT (content): Merge conflict in tests/bios-tables-test.c
> > Auto-merging tests/acpi-utils.h
> > CONFLICT (content): Merge conflict in tests/acpi-utils.h
> > Auto-merging tests/acpi-utils.c
> > CONFLICT (content): Merge conflict in tests/acpi-utils.c
> > Removing include/hw/smbios/ipmi.h
> 
> I'm working on fixing conflicts due to 29/30 and will include conflicting patch in my acpi tests cleanup on respin
> 
> Meanwhile could you drop 29/30 and apply the rest of pull request (which applies just fine)?

I rebased it all. Preparing a pull request. Can you look at my tree
for_upstream branch and confirm?

Thanks!

> > 
> > Please can you rebase and resend?
> > 
> > thanks
> > -- PMM
> >