#ifdef CONFIG_DEBUG_VNET_NIC
{
- PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d\n",
- len, vnetnic->vnet_dev_id);
- v3_hexdump(buf, len, NULL, 0);
+ PrintDebug("VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n",
+ pkt.size, pkt.src_id, pkt.src_type);
+ //v3_hexdump(buf, len, NULL, 0);
}
#endif
struct v3_vnet_pkt * pkt,
void * private_data){
struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
+
+ PrintDebug("VNET-NIC: receive pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n",
+ pkt->size, pkt->src_id, pkt->src_type, pkt->dst_id, pkt->dst_type);
- return vnetnic->net_ops.recv(pkt->data,
- pkt->size,
- vnetnic->net_ops.frontend_data);
+ return vnetnic->net_ops.recv(pkt->data, pkt->size,
+ vnetnic->net_ops.frontend_data);
}
/* tell frontend device to poll data from guest */
}
-static int vnet_nic_free(struct vm_device * dev) {
+static int vnet_nic_free(struct vnet_nic_state * vnetnic) {
+
+
+ V3_Free(vnetnic);
return 0;
}
static struct v3_device_ops dev_ops = {
- .free = vnet_nic_free,
+ .free = (int (*)(void *))vnet_nic_free,
};
&(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) {
PrintError("Could not connect %s to frontend %s\n",
dev_id, v3_cfg_val(frontend_cfg, "tag"));
- v3_remove_device(vnetnic);
+ v3_remove_device(dev);
return -1;
}
if ((vnet_dev_id = register_to_vnet(vm, vnetnic, dev_id, vnetnic->mac)) == -1) {
PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", dev_id, macstr);
- v3_remove_device(vnetnic);
+ v3_remove_device(dev);
return 0;
}
//for temporary hack for vnet bridge test
-#if 0
+#if 1
{
uchar_t zeromac[6] = {0,0,0,0,0,0};
#endif
//for temporary hack for Linux bridge (w/o encapuslation) test
-#if 1
+#if 0
{
static int vnet_nic_guestid = -1;
static int vnet_nic_dom0 = -1;