From: Chengwen Feng <[email protected]> Rename socket_id parameters, internal structure fields, variables and comments to the NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <[email protected]> --- drivers/bus/vmbus/linux/vmbus_bus.c | 2 +- drivers/bus/vmbus/vmbus_channel.c | 2 +- drivers/bus/vmbus/vmbus_common.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bus/vmbus/linux/vmbus_bus.c b/drivers/bus/vmbus/linux/vmbus_bus.c index 779ea50b92..86276eb564 100644 --- a/drivers/bus/vmbus/linux/vmbus_bus.c +++ b/drivers/bus/vmbus/linux/vmbus_bus.c @@ -330,7 +330,7 @@ vmbus_scan_one(const char *name) dev->device.devargs = rte_bus_find_devargs(&rte_vmbus_bus, dev->name); - dev->device.numa_node = SOCKET_ID_ANY; + dev->device.numa_node = RTE_NUMA_ID_ANY; if (vmbus_use_numa(dev)) { /* get numa node (if present) */ snprintf(filename, sizeof(filename), "%s/numa_node", diff --git a/drivers/bus/vmbus/vmbus_channel.c b/drivers/bus/vmbus/vmbus_channel.c index 90ba3d1ef6..d25db272b3 100644 --- a/drivers/bus/vmbus/vmbus_channel.c +++ b/drivers/bus/vmbus/vmbus_channel.c @@ -345,7 +345,7 @@ int vmbus_chan_create(const struct rte_vmbus_device *device, struct vmbus_channel *chan; int err; - chan = rte_zmalloc_socket("VMBUS", sizeof(*chan), RTE_CACHE_LINE_SIZE, + chan = rte_zmalloc_numa("VMBUS", sizeof(*chan), RTE_CACHE_LINE_SIZE, device->device.numa_node); if (!chan) return -ENOMEM; diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c index 4c64856abb..755e47fc91 100644 --- a/drivers/bus/vmbus/vmbus_common.c +++ b/drivers/bus/vmbus/vmbus_common.c @@ -104,7 +104,7 @@ vmbus_probe_device(struct rte_driver *drv, struct rte_device *dev) if (ret != 0) goto free_intr; - if (vmbus_dev->device.numa_node < 0 && rte_socket_count() > 1) + if (vmbus_dev->device.numa_node < 0 && rte_numa_count() > 1) VMBUS_LOG(INFO, "Device %s is not NUMA-aware", guid); /* call the driver probe() function */ -- 2.55.0
