|WARNING| pw123684 [PATCH] net/virtio-user: fix number of vrings calculation

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/123684

_apply patch failure_

Submitter: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Friday, February 10 2023 15:10:44 
Applied on: CommitID:183bdfe224760b72d3cd44f5367c80b5ee073327
Apply patch set 123684 failed:

Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.c...
error: while searching for:
	bool packed_ring = !!(dev->device_features & (1ull << VIRTIO_F_RING_PACKED));

	nr_vrings = dev->max_queue_pairs * 2;
	if (dev->hw_cvq)
		nr_vrings++;

	dev->callfds = rte_zmalloc("virtio_user_dev", nr_vrings * sizeof(*dev->callfds), 0);

error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.c:575
Applying patch drivers/net/virtio/virtio_user/virtio_user_dev.c with 1 reject...
Rejected hunk #1.
diff a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c	(rejected hunks)
@@ -575,7 +575,7 @@ virtio_user_alloc_vrings(struct virtio_user_dev *dev)
 	bool packed_ring = !!(dev->device_features & (1ull << VIRTIO_F_RING_PACKED));
 
 	nr_vrings = dev->max_queue_pairs * 2;
-	if (dev->hw_cvq)
+	if (dev->device_features & (1ull << VIRTIO_NET_F_MQ))
 		nr_vrings++;
 
 	dev->callfds = rte_zmalloc("virtio_user_dev", nr_vrings * sizeof(*dev->callfds), 0);

https://lab.dpdk.org/results/dashboard/patchsets/25345/

UNH-IOL DPDK Community Lab