Re: [PATCH v2] net/virtio-user: fix multi-process issue
From: Ami Sabo <hidden>
Date: 2017-02-23 09:02:40
Mistakenly sent only partial diff. Resent the all patch (from the original code base) as a reply to the first message in the thread. -- Ami -----Original Message----- From: Yuanhan Liu [mailto:yuanhan.liu@linux.intel.com] Sent: Thursday, February 23, 2017 4:55 AM To: Ami Sabo Cc: dev@dpdk.org Subject: Re: [PATCH v2] net/virtio-user: fix multi-process issue On Wed, Feb 22, 2017 at 05:40:28PM +0200, Ami Sabo wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/virtio/virtio_user_ethdev.cb/drivers/net/virtio/virtio_user_ethdev.c index 5291294..9b3c266 100644--- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c@@ -418,25 +418,25 @@ virtio_user_pmd_probe(const char *name, const char *params) goto end; } - if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - eth_dev = virtio_user_eth_dev_alloc(name); - if (!eth_dev) { - PMD_INIT_LOG(ERR, "virtio_user fails to alloc device"); - goto end; - } - hw = eth_dev->data->dev_private; - if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq, - queue_size, mac_addr) < 0) { - PMD_INIT_LOG(ERR, "virtio_user_dev_init fails"); - virtio_user_eth_dev_free(eth_dev); - goto end; - } - } else { - eth_dev = rte_eth_dev_attach_secondary(name); - if (!eth_dev) { - goto end; - } - }
Were you making the patch based on some internal code base? The latest virtio code doesn't have the above code.
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ eth_dev = virtio_user_eth_dev_alloc(name);
+ if (!eth_dev) {
+ PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
+ goto end;
+ }
+ hw = eth_dev->data->dev_private;
+ if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
+ queue_size, mac_addr) < 0) {
+ PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
+ virtio_user_eth_dev_free(eth_dev);
+ goto end;
+ }
+ } else {
+ eth_dev = rte_eth_dev_attach_secondary(name);We also don't have rte_eth_dev_attach_secondary exported, neither. --yliu