[dpdk-dev,v6,3/8] eal/bsd: dummy for new intr definition

Message ID 1425012976-10173-4-git-send-email-cunming.liang@intel.com (mailing list archive)
State Changes Requested, archived
Headers

Commit Message

Cunming Liang Feb. 27, 2015, 4:56 a.m. UTC
  To make bsd compiling happy with new intr changes.

Signed-off-by: Cunming Liang <cunming.liang@intel.com>
---
 lib/librte_eal/bsdapp/eal/eal_interrupts.c                | 15 +++++++++++++++
 .../bsdapp/eal/include/exec-env/rte_interrupts.h          |  4 ++++
 lib/librte_eal/bsdapp/eal/rte_eal_version.map             |  2 ++
 3 files changed, 21 insertions(+)
  

Comments

David Marchand Feb. 27, 2015, 9:59 a.m. UTC | #1
Hello,

On Fri, Feb 27, 2015 at 5:56 AM, Cunming Liang <cunming.liang@intel.com>
wrote:
>
> diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
> b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
> index 87a9cf6..b114aac 100644
> --- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
> +++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
> @@ -38,6 +38,8 @@
>  #ifndef _RTE_LINUXAPP_INTERRUPTS_H_
>  #define _RTE_LINUXAPP_INTERRUPTS_H_
>
> +#define VFIO_MAX_RXTX_INTR_ID        32
> +
>  enum rte_intr_handle_type {
>         RTE_INTR_HANDLE_UNKNOWN = 0,
>         RTE_INTR_HANDLE_UIO,      /**< uio device handle */
> @@ -49,6 +51,8 @@ enum rte_intr_handle_type {
>  struct rte_intr_handle {
>         int fd;                          /**< file descriptor */
>         enum rte_intr_handle_type type;  /**< handle type */
> +       int max_intr;                    /**< max interrupt requested */
> +       uint32_t vec_num[VFIO_MAX_QUEUE_ID]; /**< rxtx intr vector number
> */
>  };
>

No need to add those since this is not supported for bsd.
  

Patch

diff --git a/lib/librte_eal/bsdapp/eal/eal_interrupts.c b/lib/librte_eal/bsdapp/eal/eal_interrupts.c
index cb7d4f1..21fab1a 100644
--- a/lib/librte_eal/bsdapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/bsdapp/eal/eal_interrupts.c
@@ -69,3 +69,18 @@  rte_eal_intr_init(void)
 	return 0;
 }
 
+int
+rte_intr_rx_wait(struct rte_intr_handle *intr_handle __rte_unused,
+		 int fd __rte_unused, uint32_t *vec __rte_unused,
+		 uint16_t num __rte_unused)
+{
+	return -ENOTSUP;
+}
+
+int
+rte_intr_rx_set(struct rte_intr_handle *intr_handle __rte_unused,
+		int fd __rte_unused, int op __rte_unused,
+		uint32_t vec __rte_unused)
+{
+	return -ENOTSUP;
+}
diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
index 87a9cf6..b114aac 100644
--- a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
+++ b/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
@@ -38,6 +38,8 @@ 
 #ifndef _RTE_LINUXAPP_INTERRUPTS_H_
 #define _RTE_LINUXAPP_INTERRUPTS_H_
 
+#define VFIO_MAX_RXTX_INTR_ID        32
+
 enum rte_intr_handle_type {
 	RTE_INTR_HANDLE_UNKNOWN = 0,
 	RTE_INTR_HANDLE_UIO,      /**< uio device handle */
@@ -49,6 +51,8 @@  enum rte_intr_handle_type {
 struct rte_intr_handle {
 	int fd;                          /**< file descriptor */
 	enum rte_intr_handle_type type;  /**< handle type */
+	int max_intr;                    /**< max interrupt requested */
+	uint32_t vec_num[VFIO_MAX_QUEUE_ID]; /**< rxtx intr vector number */
 };
 
 #endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */
diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
index 17515a9..bf92029 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
@@ -58,6 +58,8 @@  DPDK_2.0 {
 	rte_intr_callback_unregister;
 	rte_intr_disable;
 	rte_intr_enable;
+	rte_intr_rx_set;
+	rte_intr_rx_wait;
 	rte_log;
 	rte_log_add_in_history;
 	rte_log_cur_msg_loglevel;