X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fconf%2Fstartup.conf;h=7532f5026314503a8c9c6a7f605bb85adf32602f;hb=940d1c8a18d672c37c6545ffdabd090d29f09850;hp=2a12ef9ec2ae50d856c6e0fb23aed4387a76f418;hpb=28cf3b7da279c0755f6dc345c0973d1e3017e9ca;p=vpp.git

diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index 2a12ef9ec2a..7532f502631 100644
--- a/src/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
@@ -15,7 +15,7 @@ api-trace {
 ##
 ## To set the number of binary API trace records in the circular buffer, configure nitems
 ##
-## nitems <nnn> 
+## nitems <nnn>
 ##
 ## To save the api message table decode tables, configure a filename. Results in /tmp/<filename>
 ## Very handy for understanding api message changes between versions, identifying missing
@@ -28,13 +28,18 @@ api-segment {
   gid vpp
 }
 
+socksvr {
+  default
+}
+
 cpu {
 	## In the VPP there is one main thread and optionally the user can create worker(s)
 	## The main thread and worker thread(s) can be pinned to CPU core(s) manually or automatically
 
 	## Manual pinning of thread(s) to CPU core(s)
 
-	## Set logical CPU core where main thread runs
+	## Set logical CPU core where main thread runs, if main core is not set
+	## VPP will use core 1 if available
 	# main-core 1
 
 	## Set logical CPU core(s) where worker threads are running
@@ -65,7 +70,7 @@ cpu {
 }
 
 # dpdk {
-	## Change default settings for all intefaces
+	## Change default settings for all interfaces
 	# dev default {
 		## Number of receive queues, enables RSS
 		## Default is 1
@@ -89,6 +94,11 @@ cpu {
 	## Whitelist specific interface by specifying PCI address
 	# dev 0000:02:00.0
 
+	## Set interface name
+	# dev 0000:02:00.1 {
+	#	name eth0
+	# }
+
 	## Whitelist specific interface by specifying PCI address and in
 	## addition specify custom parameters for this interface
 	# dev 0000:02:00.1 {
@@ -96,8 +106,8 @@ cpu {
 	# }
 
 	## Specify bonded interface and its slaves via PCI addresses
-	## 
-        ## Bonded interface in XOR load balance mode (mode 2) with L3 and L4 headers 
+	##
+	## Bonded interface in XOR load balance mode (mode 2) with L3 and L4 headers
 	# vdev eth_bond0,mode=2,slave=0000:02:00.0,slave=0000:03:00.0,xmit_policy=l34
 	# vdev eth_bond1,mode=2,slave=0000:02:00.1,slave=0000:03:00.1,xmit_policy=l34
 	##
@@ -109,7 +119,7 @@ cpu {
 	## uio_pci_generic or auto (default)
 	# uio-driver vfio-pci
 
-	## Disable mutli-segment buffers, improves performance but
+	## Disable multi-segment buffers, improves performance but
 	## disables Jumbo MTU support
 	# no-multi-seg
 
@@ -127,11 +137,20 @@ cpu {
 	# no-tx-checksum-offload
 # }
 
-# Adjusting the plugin path depending on where the VPP plugins are:
-#plugins
-#{
-#	path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins
-#}
 
-# Alternate syntax to choose plugin path
-#plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins
+# plugins {
+	## Adjusting the plugin path depending on where the VPP plugins are
+	#	path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins
+
+	## Disable all plugins by default and then selectively enable specific plugins
+	# plugin default { disable }
+	# plugin dpdk_plugin.so { enable }
+	# plugin acl_plugin.so { enable }
+
+	## Enable all plugins by default and then selectively disable specific plugins
+	# plugin dpdk_plugin.so { disable }
+	# plugin acl_plugin.so { disable }
+# }
+
+	## Alternate syntax to choose plugin path
+	# plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins