X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnic_bridge.c;h=e70d7a11725ad7084ee5ccbeb6b261c2f186b87b;hb=18713f98a14335b09cb7d87b3bea087255eaf10d;hp=60f606f7a583f4f66ec0d4e163fbd21e3815f6bd;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios.git diff --git a/palacios/src/devices/nic_bridge.c b/palacios/src/devices/nic_bridge.c index 60f606f..e70d7a1 100644 --- a/palacios/src/devices/nic_bridge.c +++ b/palacios/src/devices/nic_bridge.c @@ -37,12 +37,11 @@ struct nic_bridge_state { static int bridge_send(uint8_t * buf, uint32_t len, void * private_data) { - //struct nic_bridge_state *bridge = (struct nic_bridge_state *)private_data; #ifdef CONFIG_DEBUG_NIC_BRIDGE { PrintDebug("NIC Bridge: send pkt size: %d\n", len); - //v3_hexdump(buf, len, NULL, 0); + v3_hexdump(buf, len, NULL, 0); } #endif @@ -54,7 +53,12 @@ static int packet_input(struct v3_vm_info * vm, void * private_data) { struct nic_bridge_state * bridge = (struct nic_bridge_state *)private_data; - PrintDebug("NIC_BRIDGE: Incoming packet size: %d\n", evt->size); +#ifdef CONFIG_DEBUG_NIC_BRIDGE + { + PrintDebug("NIC Bridge: recv pkt size: %d\n", evt->size); + v3_hexdump(evt->pkt, evt->size, NULL, 0); + } +#endif return bridge->net_ops.recv(evt->pkt, evt->size, @@ -62,7 +66,7 @@ static int packet_input(struct v3_vm_info * vm, } -static int vnet_nic_free(struct nic_bridge_state * bridge) { +static int nic_bridge_free(struct nic_bridge_state * bridge) { /*detach from front device */ @@ -72,11 +76,11 @@ static int vnet_nic_free(struct nic_bridge_state * bridge) { } static struct v3_device_ops dev_ops = { - .free = (int (*)(void *))vnet_nic_free, + .free = (int (*)(void *))nic_bridge_free, }; -static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { +static int nic_bridge_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct nic_bridge_state * bridge = NULL; char * dev_id = v3_cfg_val(cfg, "ID"); @@ -112,4 +116,4 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { return 0; } -device_register("NIC_BRIDGE", vnet_nic_init) +device_register("NIC_BRIDGE", nic_bridge_init)