[Qemu-commits] [qemu/qemu] 703857: vhost-user-fs: remove "vhostfd" property

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 703857348724319735d9be7b5b996e6445c6e6b9
      
https://github.com/qemu/qemu/commit/703857348724319735d9be7b5b996e6445c6e6b9
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-12-13 (Fri, 13 Dec 2019)

  Changed paths:
    M hw/virtio/vhost-user-fs.c
    M include/hw/virtio/vhost-user-fs.h

  Log Message:
  -----------
  vhost-user-fs: remove "vhostfd" property

The property doesn't make much sense for a vhost-user device.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 366844f3d1329c6423dd752891a28ccb3ee8fddd
      
https://github.com/qemu/qemu/commit/366844f3d1329c6423dd752891a28ccb3ee8fddd
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2019-12-13 (Fri, 13 Dec 2019)

  Changed paths:
    M hw/virtio/vhost-user-fs-pci.c

  Log Message:
  -----------
  virtio-fs: fix MSI-X nvectors calculation

The following MSI-X vectors are required:
 * VIRTIO Configuration Change
 * hiprio virtqueue
 * requests virtqueues

Fix the calculation to reserve enough MSI-X vectors.  Otherwise guest
drivers fall back to a sub-optional configuration where all virtqueues
share a single vector.

This change does not break live migration compatibility since
vhost-user-fs-pci devices are not migratable yet.

Reported-by: Vivek Goyal <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 4148d142a8cbbce10bb77e560997ae6b482e5edf
      
https://github.com/qemu/qemu/commit/4148d142a8cbbce10bb77e560997ae6b482e5edf
  Author: Peter Maydell <address@hidden>
  Date:   2019-12-13 (Fri, 13 Dec 2019)

  Changed paths:
    M hw/virtio/vhost-user-fs-pci.c
    M hw/virtio/vhost-user-fs.c
    M include/hw/virtio/vhost-user-fs.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-virtiofs-20191213a' 
into staging

virtiofs pull 2019-12-13: Minor fixes and cleanups

Cleanup from Marc-André and MSI-X fix from Stefan.

# gpg: Signature made Fri 13 Dec 2019 11:53:49 GMT
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <address@hidden>" 
[full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-virtiofs-20191213a:
  virtio-fs: fix MSI-X nvectors calculation
  vhost-user-fs: remove "vhostfd" property

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


Compare: https://github.com/qemu/qemu/compare/35081f79fa8c...4148d142a8cb