Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Plugin infrastructure improvements
[vpp.git]
/
src
/
vpp
/
vnet
/
main.c
diff --git
a/src/vpp/vnet/main.c
b/src/vpp/vnet/main.c
index
a252b84
..
4a96ca9
100644
(file)
--- a/
src/vpp/vnet/main.c
+++ b/
src/vpp/vnet/main.c
@@
-18,7
+18,7
@@
#include <vlib/unix/unix.h>
#include <vnet/plugin/plugin.h>
#include <vnet/ethernet/ethernet.h>
#include <vlib/unix/unix.h>
#include <vnet/plugin/plugin.h>
#include <vnet/ethernet/ethernet.h>
-
+#include <vpp/app/version.h>
#include <vpp/api/vpe_msg_enum.h>
#include <vpp/api/vpe_msg_enum.h>
@@
-39,16
+39,7
@@
vpe_main_init (vlib_main_t * vm)
* Load plugins from /usr/lib/vpp_plugins by default
*/
char *vlib_plugin_path = "/usr/lib/vpp_plugins";
* Load plugins from /usr/lib/vpp_plugins by default
*/
char *vlib_plugin_path = "/usr/lib/vpp_plugins";
-
-void *
-vnet_get_handoff_structure (void)
-{
- static vnet_plugin_handoff_t _rv, *rv = &_rv;
-
- rv->vnet_main = vnet_get_main ();
- rv->ethernet_main = ðernet_main;
- return (void *) rv;
-}
+char *vlib_plugin_app_version = VPP_BUILD_VER;
int
main (int argc, char *argv[])
int
main (int argc, char *argv[])
@@
-59,7
+50,6
@@
main (int argc, char *argv[])
uword main_heap_size = (1ULL << 30);
u8 *sizep;
u32 size;
uword main_heap_size = (1ULL << 30);
u8 *sizep;
u32 size;
- void vlib_set_get_handoff_structure_cb (void *cb);
#if __x86_64__
CLIB_UNUSED (const char *msg)
#if __x86_64__
CLIB_UNUSED (const char *msg)
@@
-206,7
+196,6
@@
defaulted:
#if DPDK == 0
unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
#endif
#if DPDK == 0
unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
#endif
- vlib_set_get_handoff_structure_cb (&vnet_get_handoff_structure);
return vlib_unix_main (argc, argv);
}
else
return vlib_unix_main (argc, argv);
}
else