From: Damjan Marion <damarion@cisco.com>
Date: Thu, 17 Mar 2016 09:28:23 +0000 (+0100)
Subject: Reincarnate call to unix_physmem_init() for non-dpdk use
X-Git-Tag: v16.06-rc1~237
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=89b3398a81ab0bcfc891ad78b24dbc8721bbc514;p=vpp.git

Reincarnate call to unix_physmem_init() for non-dpdk use

Change-Id: Iaa3da32060e78bbc505ee84a2a6393f899aa110e
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c
index 9d89ce70158..f6d21a675bc 100644
--- a/vpp/vnet/main.c
+++ b/vpp/vnet/main.c
@@ -196,6 +196,9 @@ defaulted:
     if (clib_mem_init (0, main_heap_size)) {
         vm->init_functions_called = hash_create (0, /* value bytes */ 0);
         vpe_main_init(vm);
+#if ! DPDK
+        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 {