diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-12-13 15:58:53 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-12-13 15:58:54 +0000 |
| commit | 4148d142a8cbbce10bb77e560997ae6b482e5edf (patch) | |
| tree | 5f362f14ad4082752669986747809542c7da49a1 | |
| parent | 35081f79fa8cd79f025aed0a906d4772598d536d (diff) | |
| parent | 366844f3d1329c6423dd752891a28ccb3ee8fddd (diff) | |
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>
| -rw-r--r-- | hw/virtio/vhost-user-fs-pci.c | 3 | ||||
| -rw-r--r-- | hw/virtio/vhost-user-fs.c | 1 | ||||
| -rw-r--r-- | include/hw/virtio/vhost-user-fs.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c index 933a3f265b..e3a649d4a6 100644 --- a/hw/virtio/vhost-user-fs-pci.c +++ b/hw/virtio/vhost-user-fs-pci.c @@ -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)); diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index f0df7f4746..ca0b7fc9de 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -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(), }; diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-user-fs.h index 539885b458..9ff1bdb7cf 100644 --- a/include/hw/virtio/vhost-user-fs.h +++ b/include/hw/virtio/vhost-user-fs.h @@ -28,7 +28,6 @@ typedef struct { char *tag; uint16_t num_request_queues; uint16_t queue_size; - char *vhostfd; } VHostUserFSConf; typedef struct { |