X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fvnet%2Fvnet_core.c;h=38c2f1d2f818ac6cc9303295be28749b8515ce3b;hb=f47bc5f7b2fa7169df0c618369224fffb12007b3;hp=946de1fa1ff48a3d30f8b2642336210016aacd16;hpb=6cff7c8b0ec58e3b94d9583f709ca9056ae928dd;p=palacios-OLD.git diff --git a/palacios/src/vnet/vnet_core.c b/palacios/src/vnet/vnet_core.c index 946de1f..38c2f1d 100644 --- a/palacios/src/vnet/vnet_core.c +++ b/palacios/src/vnet/vnet_core.c @@ -29,7 +29,7 @@ #define Vnet_Debug(fmt, args...) #endif -int vnet_debug = 0; +int net_debug = 0; struct eth_hdr { uint8_t dst_mac[ETH_ALEN]; @@ -88,10 +88,10 @@ struct queue_entry{ #define VNET_QUEUE_SIZE 1024 struct vnet_queue { - struct queue_entry buf[VNET_QUEUE_SIZE]; - int head, tail; - int count; - vnet_lock_t lock; + struct queue_entry buf[VNET_QUEUE_SIZE]; + int head, tail; + int count; + vnet_lock_t lock; }; static struct { @@ -423,7 +423,7 @@ static struct route_list * match_route(const struct v3_vnet_pkt * pkt) { } matches = (struct route_list *)Vnet_Malloc(sizeof(struct route_list) + - (sizeof(struct vnet_route_info *) * num_matches)); + (sizeof(struct vnet_route_info *) * num_matches)); matches->num_routes = num_matches; @@ -447,7 +447,7 @@ int vnet_tx_one_pkt(struct v3_vnet_pkt * pkt, void * private_data) { Vnet_Print(2, "VNET/P Core: cpu %d: pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", cpu, pkt->size, pkt->src_id, pkt->src_type, pkt->dst_id, pkt->dst_type); - if(vnet_debug >= 4){ + if(net_debug >= 4){ v3_hexdump(pkt->data, pkt->size, NULL, 0); } @@ -485,7 +485,7 @@ int vnet_tx_one_pkt(struct v3_vnet_pkt * pkt, void * private_data) { if (bridge == NULL) { Vnet_Print(2, "VNET/P Core: No active bridge to sent data to\n"); - continue; + continue; } if(bridge->brg_ops.input(bridge->vm, pkt, bridge->private_data) < 0){ @@ -567,7 +567,7 @@ int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data, int synchron vnet_tx_one_pkt(pkt, NULL); }else { vnet_pkt_enqueue(pkt); - Vnet_Print(2, "VNET/P Core: Put pkt into Queue: pkt size %d\n", pkt->size); + Vnet_Print(2, "VNET/P Core: Put pkt into Queue: pkt size %d\n", pkt->size); } return 0;