vhost: replace device ID in vDPA ops

[dpdk.git] / lib / librte_vhost / rte_vdpa.h

diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h
index ecb3d91..109cf83 100644 (file)
--- a/lib/librte_vhost/rte_vdpa.h
+++ b/lib/librte_vhost/rte_vdpa.h
@@ -18,28 +18,11 @@
 
 #define MAX_VDPA_NAME_LEN 128
 
-enum vdpa_addr_type {
-       VDPA_ADDR_PCI,
-       VDPA_ADDR_MAX
-};
-
-/**
- * vdpa device address
- */
-struct rte_vdpa_dev_addr {
-       /** vdpa address type */
-       enum vdpa_addr_type type;
-
-       /** vdpa pci address */
-       union {
-               uint8_t __dummy[64];
-               struct rte_pci_addr pci_addr;
-       };
-};
-
 /** Maximum name length for statistics counters */
 #define RTE_VDPA_STATS_NAME_SIZE 64
 
+struct rte_vdpa_device;
+
 /**
  * A vDPA device statistic structure
  *
@@ -70,13 +53,14 @@ struct rte_vdpa_stat_name {
  */
 struct rte_vdpa_dev_ops {
        /** Get capabilities of this device */
-       int (*get_queue_num)(int did, uint32_t *queue_num);
+       int (*get_queue_num)(struct rte_vdpa_device *dev, uint32_t *queue_num);
 
        /** Get supported features of this device */
-       int (*get_features)(int did, uint64_t *features);
+       int (*get_features)(struct rte_vdpa_device *dev, uint64_t *features);
 
        /** Get supported protocol features of this device */
-       int (*get_protocol_features)(int did, uint64_t *protocol_features);
+       int (*get_protocol_features)(struct rte_vdpa_device *dev,
+                       uint64_t *protocol_features);
 
        /** Driver configure/close the device */
        int (*dev_conf)(int vid);
@@ -102,15 +86,16 @@ struct rte_vdpa_dev_ops {
                        uint64_t *offset, uint64_t *size);
 
        /** Get statistics name */
-       int (*get_stats_names)(int did, struct rte_vdpa_stat_name *stats_names,
-                              unsigned int size);
+       int (*get_stats_names)(struct rte_vdpa_device *dev,
+                       struct rte_vdpa_stat_name *stats_names,
+                       unsigned int size);
 
        /** Get statistics of the queue */
-       int (*get_stats)(int did, int qid, struct rte_vdpa_stat *stats,
-                        unsigned int n);
+       int (*get_stats)(struct rte_vdpa_device *dev, int qid,
+                       struct rte_vdpa_stat *stats, unsigned int n);
 
        /** Reset statistics of the queue */
-       int (*reset_stats)(int did, int qid);
+       int (*reset_stats)(struct rte_vdpa_device *dev, int qid);
 
        /** Reserved for future extension */
        void *reserved[2];
@@ -120,8 +105,8 @@ struct rte_vdpa_dev_ops {
  * vdpa device structure includes device address and device operations.
  */
 struct rte_vdpa_device {
-       /** vdpa device address */
-       struct rte_vdpa_dev_addr addr;
+       /** Generic device information */
+       struct rte_device *device;
        /** vdpa device operations */
        struct rte_vdpa_dev_ops *ops;
 } __rte_cache_aligned;
@@ -137,11 +122,11 @@ struct rte_vdpa_device {
  * @param ops
  *  the vdpa device operations
  * @return
- *  device id on success, -1 on failure
+ *  vDPA device pointer on success, NULL on failure
  */
 __rte_experimental
-int
-rte_vdpa_register_device(struct rte_vdpa_dev_addr *addr,
+struct rte_vdpa_device *
+rte_vdpa_register_device(struct rte_device *rte_dev,
                struct rte_vdpa_dev_ops *ops);
 
 /**
@@ -151,13 +136,28 @@ rte_vdpa_register_device(struct rte_vdpa_dev_addr *addr,
  * Unregister a vdpa device
  *
  * @param did
- *  vdpa device id
+ *  vDPA device pointer
+ * @return
+ *  device id on success, -1 on failure
+ */
+__rte_experimental
+int
+rte_vdpa_unregister_device(struct rte_vdpa_device *);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Find the device id of a vdpa device from its name
+ *
+ * @param name
+ *  the vdpa device name
  * @return
  *  device id on success, -1 on failure
  */
 __rte_experimental
 int
-rte_vdpa_unregister_device(int did);
+rte_vdpa_find_device_id_by_name(const char *name);
 
 /**
  * @warning
@@ -172,7 +172,7 @@ rte_vdpa_unregister_device(int did);
  */
 __rte_experimental
 int
-rte_vdpa_find_device_id(struct rte_vdpa_dev_addr *addr);
+rte_vdpa_find_device_id(struct rte_vdpa_device *dev);
 
 /**
  * @warning