[Qemu-commits] [qemu/qemu] a58dfb: pcie_root_port: Allow ACS to be disabled

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a58dfba20168dae18650ad70f47af99be55b1c45
      
https://github.com/qemu/qemu/commit/a58dfba20168dae18650ad70f47af99be55b1c45
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M hw/pci-bridge/pcie_root_port.c
    M include/hw/pci/pcie_port.h

  Log Message:
  -----------
  pcie_root_port: Allow ACS to be disabled

ACS was added in 4.0 unconditionally, this breaks migration
compatibility.
Allow ACS to be disabled by adding a property that's
checked by pcie_root_port.

Unfortunately pcie-root-port doesn't have any instance data,
so there's no where for that flag to live, so stuff it into
PCIESlot.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c8557f1b4873549fc231496f00003a9e5389c8dd
      
https://github.com/qemu/qemu/commit/c8557f1b4873549fc231496f00003a9e5389c8dd
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M hw/core/machine.c

  Log Message:
  -----------
  pcie_root_port: Disable ACS on older machines

ACS got added in 4.0 unconditionally,  that broke older<->4.0 migration
where there was a PCIe root port.
Fix this by turning it off for 3.1 and older machines; note this
fixes compatibility for older QEMUs but breaks compatibility with 4.0
for older machine types.

    machine type    source qemu   dest qemu
       3.1             3.1           4.0        broken
       3.1             3.1           4.1rc2     broken
       3.1             3.1           4.1+this   OK ++
       3.1             4.0           4.1rc2     OK
       3.1             4.0           4.1+this   broken --
       4.0             4.0           4.1rc2     OK
       4.0             4.0           4.1+this   OK

So we gain and lose; the consensus seems to be treat this as a
fix for older machine types.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4366e7cfb4486cfe3e2947f3b0276082c2b43a90
      
https://github.com/qemu/qemu/commit/4366e7cfb4486cfe3e2947f3b0276082c2b43a90
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M hw/core/machine.c
    M hw/pci-bridge/pcie_root_port.c
    M include/hw/pci/pcie_port.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pci: bugfix

A last minute fix to cross-version migration.
Better late than never.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Tue 30 Jul 2019 17:07:42 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>" [full]
# gpg:                 aka "Michael S. Tsirkin <address@hidden>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  pcie_root_port: Disable ACS on older machines
  pcie_root_port: Allow ACS to be disabled

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/987a23224218...4366e7cfb448