diff options
| author |   Jean-Mickael Guerin <jean-mickael.guerin@6wind.com> | 2016-03-04 14:14:21 +0100 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-03-14 12:40:17 +0000 |
| commit | 8941ec2cb4ff29dbf167e3b80e09a70c9164cc19 (patch) | |
| tree | 62e64a2f5e13a2ce6257c102c5f48a074e017716 /vnet/vnet/devices | |
| parent | 966a8b868b33de72d5d9edb6317418165c62661c (diff) | |
fix declaration of symbol of different size
I got many warnings at the link step with gcc version 5.3.1 20160225 (Ubuntu 5.3.1-10ubuntu2):
/usr/bin/ld: Warning: size of symbol `cop_input_node' changed from 112 in vnet/cop/.libs/cop.o to 168 in vnet/cop/.libs/node1.o
/usr/bin/ld: Warning: size of symbol `ethernet_input_node' changed from 112 in vnet/.libs/interface.o to 136 in vnet/ethernet/.libs/node.o
/usr/bin/ld: Warning: size of symbol `l2output_node' changed from 112 in vnet/l2/.libs/l2_efp_filter.o to 120 in vnet/l2/.libs/l2_output.o
/usr/bin/ld: Warning: size of symbol `srp_input_node' changed from 112 in vnet/srp/.libs/format.o to 136 in vnet/srp/.libs/node.o
/usr/bin/ld: Warning: size of symbol `vxlan_encap_node' changed from 112 in vnet/vxlan/.libs/vxlan.o to 128 in vnet/vxlan/.libs/encap.o
/usr/bin/ld: Warning: size of symbol `vxlan_input_node' changed from 112 in vnet/vxlan/.libs/vxlan.o to 144 in vnet/vxlan/.libs/decap.o
...
Looking at vlib_node_registration_t, I think the reason is that
the char * next_nodes[] could be bigger where the variable is defined
in .c file.
We should mark global variables as external in header files.
Some of them can be made static.
Change-Id: Ieb6961fd08180c9a69e1d884852703f3eb23f23f
Signed-off-by: Jean-Mickael Guerin <jean-mickael.guerin@6wind.com>
Diffstat (limited to 'vnet/vnet/devices')
| -rw-r--r-- | vnet/vnet/devices/dpdk/dpdk.h | 6 | ||||
| -rw-r--r-- | vnet/vnet/devices/ssvm/ssvm_eth.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h index 77b19baff03..1635c0a170c 100644 --- a/vnet/vnet/devices/dpdk/dpdk.h +++ b/vnet/vnet/devices/dpdk/dpdk.h @@ -66,9 +66,9 @@ #define NB_MBUF (32<<10) vnet_device_class_t dpdk_device_class; -vlib_node_registration_t dpdk_input_node; -vlib_node_registration_t dpdk_io_input_node; -vlib_node_registration_t handoff_dispatch_node; +extern vlib_node_registration_t dpdk_input_node; +extern vlib_node_registration_t dpdk_io_input_node; +extern vlib_node_registration_t handoff_dispatch_node; typedef enum { VNET_DPDK_DEV_ETH = 1, /* Standard DPDK PMD driver */ diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.h b/vnet/vnet/devices/ssvm/ssvm_eth.h index 1b077220305..618fb5ca14b 100644 --- a/vnet/vnet/devices/ssvm/ssvm_eth.h +++ b/vnet/vnet/devices/ssvm/ssvm_eth.h @@ -32,7 +32,7 @@ #include <ssvm.h> vnet_device_class_t ssvm_eth_device_class; -vlib_node_registration_t ssvm_eth_input_node; +extern vlib_node_registration_t ssvm_eth_input_node; #define SSVM_BUFFER_SIZE \ (VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES + VLIB_BUFFER_PRE_DATA_SIZE) |