ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: rename ops->get_queue_num callback

Browse Source 
It actually returns the size of given queue,
so renamed it to get_queue_size to clean up
the API

Change-Id: I88551116b3dc19644764bba78b58444802a1d443
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/408174
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2018-04-18 13:37:48 +02:00 committed by Daniel Verkamp
parent ec5cf8a221
commit 0a1a4ce116
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdk_internal/virtio.h
View File

@ -117,7 +117,7 @@ struct virtio_dev_ops {
/** Destruct virtio device */
void (*destruct_dev)(struct virtio_dev *vdev);
uint16_t (*get_queue_num)(struct virtio_dev *hw, uint16_t queue_id);
uint16_t (*get_queue_size)(struct virtio_dev *vdev, uint16_t queue_id);
int (*setup_queue)(struct virtio_dev *hw, struct virtqueue *vq);
void (*del_queue)(struct virtio_dev *hw, struct virtqueue *vq);
void (*notify_queue)(struct virtio_dev *hw, struct virtqueue *vq);

4
lib/virtio/virtio.c
View File

@ -119,7 +119,7 @@ virtio_init_queue(struct virtio_dev *dev, uint16_t vtpci_queue_idx)
* Read the virtqueue size from the Queue Size field
* Always power of 2 and if 0 virtqueue does not exist
*/
vq_size = virtio_dev_backend_ops(dev)->get_queue_num(dev, vtpci_queue_idx);
vq_size = virtio_dev_backend_ops(dev)->get_queue_size(dev, vtpci_queue_idx);
SPDK_DEBUGLOG(SPDK_LOG_VIRTIO_DEV, "vq_size: %u\n", vq_size);
if (vq_size == 0) {
SPDK_ERRLOG("virtqueue %"PRIu16" does not exist\n", vtpci_queue_idx);
@ -717,7 +717,7 @@ virtio_dev_dump_json_info(struct virtio_dev *hw, struct spdk_json_write_ctx *w)
spdk_json_write_uint32(w, hw->max_queues);
spdk_json_write_name(w, "vq_size");
spdk_json_write_uint32(w, virtio_dev_backend_ops(hw)->get_queue_num(hw, 0));
spdk_json_write_uint32(w, virtio_dev_backend_ops(hw)->get_queue_size(hw, 0));
virtio_dev_backend_ops(hw)->dump_json_info(hw, w);

4
lib/virtio/virtio_pci.c
View File

@ -243,7 +243,7 @@ modern_set_status(struct virtio_dev *dev, uint8_t status)
}
static uint16_t
modern_get_queue_num(struct virtio_dev *dev, uint16_t queue_id)
modern_get_queue_size(struct virtio_dev *dev, uint16_t queue_id)
{
struct virtio_hw *hw = dev->ctx;
@ -323,7 +323,7 @@ static const struct virtio_dev_ops modern_ops = {
.get_features = modern_get_features,
.set_features = modern_set_features,
.destruct_dev = modern_destruct_dev,
.get_queue_num = modern_get_queue_num,
.get_queue_size = modern_get_queue_size,
.setup_queue = modern_setup_queue,
.del_queue = modern_del_queue,
.notify_queue = modern_notify_queue,

12
lib/virtio/virtio_user.c
View File

@ -299,16 +299,12 @@ virtio_user_set_features(struct virtio_dev *vdev, uint64_t features)
return 0;
}
/* This function is to get the queue size, aka, number of descs, of a specified
* queue. Different with the VHOST_USER_GET_QUEUE_NUM, which is used to get the
* max supported queues.
*/
static uint16_t
virtio_user_get_queue_num(struct virtio_dev *vdev, uint16_t queue_id)
virtio_user_get_queue_size(struct virtio_dev *vdev, uint16_t queue_id)
{
struct virtio_user_dev *dev = vdev->ctx;
/* Currently, each queue has same queue size */
/* Currently each queue has same queue size */
return dev->queue_size;
}
@ -420,7 +416,7 @@ virtio_user_write_json_config(struct virtio_dev *vdev, struct spdk_json_write_ct
spdk_json_write_named_string(w, "trtype", "user");
spdk_json_write_named_string(w, "traddr", dev->path);
spdk_json_write_named_uint32(w, "vq_count", vdev->max_queues - vdev->fixed_queues_num);
spdk_json_write_named_uint32(w, "vq_size", virtio_dev_backend_ops(vdev)->get_queue_num(vdev, 0));
spdk_json_write_named_uint32(w, "vq_size", virtio_dev_backend_ops(vdev)->get_queue_size(vdev, 0));
}
static const struct virtio_dev_ops virtio_user_ops = {
@ -431,7 +427,7 @@ static const struct virtio_dev_ops virtio_user_ops = {
.get_features = virtio_user_get_features,
.set_features = virtio_user_set_features,
.destruct_dev = virtio_user_destroy,
.get_queue_num = virtio_user_get_queue_num,
.get_queue_size = virtio_user_get_queue_size,
.setup_queue = virtio_user_setup_queue,
.del_queue = virtio_user_del_queue,
.notify_queue = virtio_user_notify_queue,