[Qemu-commits] [qemu/qemu] 530a09: pcie_root_port: Add hotplug disabling option

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 530a0963184e57e71a5b538e9161f115df533e96
      
https://github.com/qemu/qemu/commit/530a0963184e57e71a5b538e9161f115df533e96
  Author: Julia Suvorova <address@hidden>
  Date:   2020-03-08 (Sun, 08 Mar 2020)

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

  Log Message:
  -----------
  pcie_root_port: Add hotplug disabling option

Make hot-plug/hot-unplug on PCIe Root Ports optional to allow libvirt
manage it and restrict unplug for the whole machine. This is going to
prevent user-initiated unplug in guests (Windows mostly).
Hotplug is enabled by default.
Usage:
    -device pcie-root-port,hotplug=off,...

If you want to disable hot-unplug on some downstream ports of one
switch, disable hot-unplug on PCIe Root Port connected to the upstream
port as well as on the selected downstream ports.

Discussion related:
    https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg00530.html

Signed-off-by: Julia Suvorova <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: f7ef7e6e3ba6e994e070cc609eb154339d1c4a11
      
https://github.com/qemu/qemu/commit/f7ef7e6e3ba6e994e070cc609eb154339d1c4a11
  Author: Jason Wang <address@hidden>
  Date:   2020-03-08 (Sun, 08 Mar 2020)

  Changed paths:
    M hw/virtio/vhost.c

  Log Message:
  -----------
  vhost: correctly turn on VIRTIO_F_IOMMU_PLATFORM

We turn on device IOTLB via VIRTIO_F_IOMMU_PLATFORM unconditionally on
platform without IOMMU support. This can lead unnecessary IOTLB
transactions which will damage the performance.

Fixing this by check whether the device is backed by IOMMU and disable
device IOTLB.

Reported-by: Halil Pasic <address@hidden>
Tested-by: Halil Pasic <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f1e92c3d52d2223306a1ea289a57fca2bc5c40a5
      
https://github.com/qemu/qemu/commit/f1e92c3d52d2223306a1ea289a57fca2bc5c40a5
  Author: Nick Erdmann <address@hidden>
  Date:   2020-03-08 (Sun, 08 Mar 2020)

  Changed paths:
    M hw/virtio/vhost-vsock.c

  Log Message:
  -----------
  vhost-vsock: fix error message output

error_setg_errno takes a positive error number, so we should not invert
errno's sign.

Signed-off-by: Nick Erdmann <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>
Fixes: fc0b9b0e1cbb ("vhost-vsock: add virtio sockets device")
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: a6f65f4fc217713ee2c78b99baae1cc31c761778
      
https://github.com/qemu/qemu/commit/a6f65f4fc217713ee2c78b99baae1cc31c761778
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-03-08 (Sun, 08 Mar 2020)

  Changed paths:
    M hw/i386/intel_iommu.c

  Log Message:
  -----------
  hw/i386/intel_iommu: Simplify vtd_find_as_from_bus_num() logic

The vtd_find_as_from_bus_num() function was introduced (in commit
dbaabb25f) in a code format that could return an incorrect pointer,
which was later fixed by commit a2e1cd41ccf.
We could have avoided this by writing the if() statement differently.
Do it now, in case this function is re-used. The code is easier to
review (harder to miss bugs).

Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 7a5853cec479a448edae0fb2aaf4e2f78c9c774d
      
https://github.com/qemu/qemu/commit/7a5853cec479a448edae0fb2aaf4e2f78c9c774d
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-09 (Mon, 09 Mar 2020)

  Changed paths:
    M hw/i386/intel_iommu.c
    M hw/pci-bridge/pcie_root_port.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/pci/pcie.c
    M hw/pci/pcie_port.c
    M hw/virtio/vhost-vsock.c
    M hw/virtio/vhost.c
    M include/hw/pci/pcie.h
    M include/hw/pci/pcie_port.h

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

virtio, pci, pc: fixes, cleanups, features

Bugfixes, cleanups all over the place.
Ability to disable hotplug for pci express ports.

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

# gpg: Signature made Sun 08 Mar 2020 13:27:54 GMT
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "address@hidden"
# 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:
  hw/i386/intel_iommu: Simplify vtd_find_as_from_bus_num() logic
  vhost-vsock: fix error message output
  vhost: correctly turn on VIRTIO_F_IOMMU_PLATFORM
  pcie_root_port: Add hotplug disabling option

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


Compare: https://github.com/qemu/qemu/compare/67f17e23baca...7a5853cec479