[DNM] virtio api change

To be solved

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>

Author: soburi

drivers/virtio/virtio_pci.c

@@ -323,11 +323,16 @@ static int virtio_pci_set_virtqueue(
 }
 
 static int virtio_pci_set_virtqueues(
-	const struct device *dev, virtio_enumerate_queues cb, void *opaque)
+	const struct device *dev, uint16_t num_queues, virtio_enumerate_queues cb, void *opaque)
 {
 	struct virtio_pci_data *data = dev->data;
 	uint16_t queue_count = sys_le16_to_cpu(data->common_cfg->num_queues);
 
+	if (num_queues > queue_count) {
+		LOG_ERR("too many queues are requested");
+		return -EINVAL;
+	}
+
 	data->virtqueues = k_malloc(queue_count * sizeof(struct virtq));
 	if (!data->virtqueues) {
 		LOG_ERR("failed to allocate virtqueue array");
@@ -608,9 +613,10 @@ void *virtio_pci_get_device_specific_config(const struct device *dev)
 	return data->device_specific_cfg;
 }
 
-int virtio_pci_init_virtqueues(const struct device *dev, virtio_enumerate_queues cb, void *opaque)
+int virtio_pci_init_virtqueues(const struct device *dev, uint16_t num_queues,
+			       virtio_enumerate_queues cb, void *opaque)
 {
-	int ret = virtio_pci_set_virtqueues(dev, cb, opaque);
+	int ret = virtio_pci_set_virtqueues(dev, num_queues, cb, opaque);
 
 	if (ret != 0) {
 		return ret;

include/zephyr/virtio/virtio.h

@@ -43,7 +43,8 @@ __subsystem struct virtio_driver_api {
 	bool (*read_driver_feature_bit)(const struct device *dev, int bit);
 	int (*write_driver_feature_bit)(const struct device *dev, int bit, bool value);
 	int (*commit_feature_bits)(const struct device *dev);
-	int (*init_virtqueues)(const struct device *dev, virtio_enumerate_queues cb, void *opaque);
+	int (*init_virtqueues)(const struct device *dev, uint16_t num_queues,
+			       virtio_enumerate_queues cb, void *opaque);
 	void (*finalize_init)(const struct device *dev);
 };
 
@@ -147,16 +148,18 @@ static inline int virtio_commit_feature_bits(const struct device *dev)
  * Initializes virtqueues
  *
  * @param dev virtio device it operates on
+ * @param num_queues number of queues to initialize
  * @param cb callback called for each available virtqueue
  * @param opaque pointer to user provided data that will be passed to the callback
  * @return 0 on success or negative error code on failure
  */
 static inline int virtio_init_virtqueues(
-	const struct device *dev, virtio_enumerate_queues cb, void *opaque)
+	const struct device *dev, uint16_t num_queues,
+	virtio_enumerate_queues cb, void *opaque)
 {
 	const struct virtio_driver_api *api = dev->api;
 
-	return api->init_virtqueues(dev, cb, opaque);
+	return api->init_virtqueues(dev, num_queues, cb, opaque);
 }
 
 /**