Commit 4148d142 authored Dec 13, 2019 by Peter Maydell

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) <dgilbert@redhat.com>" [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 <peter.maydell@linaro.org>

parents 35081f79 366844f3

hw/virtio/vhost-user-fs-pci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy vpci_dev, Error *errp)
		DeviceState *vdev = DEVICE(&dev->vdev);

		if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
		vpci_dev->nvectors = dev->vdev.conf.num_request_queues + 1;
		/* Also reserve config change and hiprio queue vectors */
		vpci_dev->nvectors = dev->vdev.conf.num_request_queues + 2;
		}

		qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

hw/virtio/vhost-user-fs.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -263,7 +263,6 @@ static Property vuf_properties[] = {
		DEFINE_PROP_UINT16("num-request-queues", VHostUserFS,
		conf.num_request_queues, 1),
		DEFINE_PROP_UINT16("queue-size", VHostUserFS, conf.queue_size, 128),
		DEFINE_PROP_STRING("vhostfd", VHostUserFS, conf.vhostfd),
		DEFINE_PROP_END_OF_LIST(),
		};

include/hw/virtio/vhost-user-fs.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ typedef struct {
		char *tag;
		uint16_t num_request_queues;
		uint16_t queue_size;
		char *vhostfd;
		} VHostUserFSConf;

		typedef struct {