vhost: prefix vDPA enum value for PCI address type

In order to avoid potential conflicts, rename the PCI_ADDR
enum value to VDPA_ADDR_PCI in vdpa_addr_type_enum.

All symbols referencing this enum are experimental, so it
does not break API policy.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Matan Azrad <matan@mellanox.com>
This commit is contained in:
Maxime Coquelin 2020-03-26 15:14:22 +01:00 committed by Ferruh Yigit
parent 7470f845c1
commit 0265a1980f
5 changed files with 5 additions and 5 deletions

View File

@ -1177,7 +1177,7 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
(1ULL << VHOST_F_LOG_ALL);
internal->dev_addr.pci_addr = pci_dev->addr;
internal->dev_addr.type = PCI_ADDR;
internal->dev_addr.type = VDPA_ADDR_PCI;
list->internal = internal;
if (rte_kvargs_count(kvlist, IFCVF_SW_FALLBACK_LM)) {

View File

@ -446,7 +446,7 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
}
priv->ctx = ctx;
priv->dev_addr.pci_addr = pci_dev->addr;
priv->dev_addr.type = PCI_ADDR;
priv->dev_addr.type = VDPA_ADDR_PCI;
priv->id = rte_vdpa_register_device(&priv->dev_addr, &mlx5_vdpa_ops);
if (priv->id < 0) {
DRV_LOG(ERR, "Failed to register vDPA device.");

View File

@ -331,7 +331,7 @@ static void cmd_create_vdpa_port_parsed(void *parsed_result,
cmdline_printf(cl, "Unable to parse the given bdf.\n");
return;
}
addr.type = PCI_ADDR;
addr.type = VDPA_ADDR_PCI;
did = rte_vdpa_find_device_id(&addr);
if (did < 0) {
cmdline_printf(cl, "Unable to find vdpa device id.\n");

View File

@ -19,7 +19,7 @@
#define MAX_VDPA_NAME_LEN 128
enum vdpa_addr_type {
PCI_ADDR,
VDPA_ADDR_PCI,
VDPA_ADDR_MAX
};

View File

@ -27,7 +27,7 @@ is_same_vdpa_device(struct rte_vdpa_dev_addr *a,
return false;
switch (a->type) {
case PCI_ADDR:
case VDPA_ADDR_PCI:
if (a->pci_addr.domain != b->pci_addr.domain ||
a->pci_addr.bus != b->pci_addr.bus ||
a->pci_addr.devid != b->pci_addr.devid ||