> -----Original Message----- > From: Maxime Coquelin <maxime.coque...@redhat.com> > Sent: Wednesday, November 30, 2022 11:57 PM > To: dev@dpdk.org; Xia, Chenbo <chenbo....@intel.com>; > david.march...@redhat.com; epere...@redhat.com > Cc: Maxime Coquelin <maxime.coque...@redhat.com> > Subject: [PATCH v1 14/21] net/virtio-user: use proper type for number of > queue pairs > > The number of queue pairs is specified as a 16 bits > unsigned int in the Virtio specification. > > Signed-off-by: Maxime Coquelin <maxime.coque...@redhat.com> > --- > drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +- > drivers/net/virtio/virtio_user/virtio_user_dev.h | 6 +++--- > drivers/net/virtio/virtio_user_ethdev.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c > b/drivers/net/virtio/virtio_user/virtio_user_dev.c > index 873c6aa036..809c9ef442 100644 > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c > @@ -553,7 +553,7 @@ virtio_user_dev_setup(struct virtio_user_dev *dev) > 1ULL << VIRTIO_F_RING_PACKED) > > int > -virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, > +virtio_user_dev_init(struct virtio_user_dev *dev, char *path, uint16_t > queues, > int cq, int queue_size, const char *mac, char **ifname, > int server, int mrg_rxbuf, int in_order, int packed_vq, > enum virtio_user_backend_type backend_type) > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h > b/drivers/net/virtio/virtio_user/virtio_user_dev.h > index 819f6463ba..3c5453eac0 100644 > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.h > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h > @@ -32,8 +32,8 @@ struct virtio_user_dev { > int callfds[VIRTIO_MAX_VIRTQUEUES]; > int kickfds[VIRTIO_MAX_VIRTQUEUES]; > int mac_specified; > - uint32_t max_queue_pairs; > - uint32_t queue_pairs; > + uint16_t max_queue_pairs; > + uint16_t queue_pairs; > uint32_t queue_size; > uint64_t features; /* the negotiated features with driver, > * and will be sync with device > @@ -64,7 +64,7 @@ struct virtio_user_dev { > int virtio_user_dev_set_features(struct virtio_user_dev *dev); > int virtio_user_start_device(struct virtio_user_dev *dev); > int virtio_user_stop_device(struct virtio_user_dev *dev); > -int virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int > queues, > +int virtio_user_dev_init(struct virtio_user_dev *dev, char *path, > uint16_t queues, > int cq, int queue_size, const char *mac, char **ifname, > int server, int mrg_rxbuf, int in_order, > int packed_vq, > diff --git a/drivers/net/virtio/virtio_user_ethdev.c > b/drivers/net/virtio/virtio_user_ethdev.c > index 78b1ed9ace..6ad5896378 100644 > --- a/drivers/net/virtio/virtio_user_ethdev.c > +++ b/drivers/net/virtio/virtio_user_ethdev.c > @@ -655,7 +655,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev) > > dev = eth_dev->data->dev_private; > hw = &dev->hw; > - if (virtio_user_dev_init(dev, path, queues, cq, > + if (virtio_user_dev_init(dev, path, (uint16_t)queues, cq, > queue_size, mac_addr, &ifname, server_mode, > mrg_rxbuf, in_order, packed_vq, backend_type) < 0) { > PMD_INIT_LOG(ERR, "virtio_user_dev_init fails"); > -- > 2.38.1
Reviewed-by: Chenbo Xia <chenbo....@intel.com>