From: Peter Maydell Date: Fri, 13 Dec 2019 15:58:53 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/dgilbert/tags/pull-virtiofs-20191213a' into... X-Git-Tag: qemu-xen-4.14.0~237 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4148d142a8cbbce10bb77e560997ae6b482e5edf;p=qemu-xen.git 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) " [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 --- 4148d142a8cbbce10bb77e560997ae6b482e5edf