X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=2a2ae6dbbee05845080fdb5958e0ea0b4a93c58f;hb=18713f98a14335b09cb7d87b3bea087255eaf10d;hp=c24eed70e193f487ba66799e3a272eacdf1c2f02;hpb=107d8f06c7083f58fc96d781efb0226edd82c7d9;p=palacios.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index c24eed7..2a2ae6d 100644 --- a/palacios/src/devices/vnet_nic.c +++ b/palacios/src/devices/vnet_nic.c @@ -58,9 +58,8 @@ static void stop_rx(void * private_data){ /* called by frontend, send pkt to VNET */ static int vnet_nic_send(uint8_t * buf, uint32_t len, - void * private_data, - struct vm_device * dest_dev){ - struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; + void * private_data) { + struct vnet_nic_state * vnetnic = (struct vnet_nic_state *)private_data; struct v3_vnet_pkt pkt; pkt.size = len; @@ -71,8 +70,8 @@ static int vnet_nic_send(uint8_t * buf, uint32_t len, #ifdef CONFIG_DEBUG_VNET_NIC { - PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d\n", - len, vnetnic->vnet_dev_id); + 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 @@ -86,10 +85,12 @@ static int virtio_input(struct v3_vm_info * info, 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 */ @@ -116,15 +117,17 @@ static void stop_tx(void * private_data){ } -static int vnet_nic_free(struct vm_device * dev) { +static int vnet_nic_free(struct vnet_nic_state * vnetnic) { + + v3_vnet_del_dev(vnetnic->vnet_dev_id); + V3_Free(vnetnic); + return 0; } static struct v3_device_ops dev_ops = { - .free = vnet_nic_free, - .reset = NULL, - .start = NULL, - .stop = NULL, + .free = (int (*)(void *))vnet_nic_free, + }; static struct v3_vnet_dev_ops vnet_dev_ops = { @@ -134,17 +137,6 @@ static struct v3_vnet_dev_ops vnet_dev_ops = { .stop_tx = stop_tx, }; - -static int register_to_vnet(struct v3_vm_info * vm, - struct vnet_nic_state * vnet_nic, - char * dev_name, uchar_t mac[6]) { - - PrintDebug("Vnet-nic: register Vnet-nic device %s, state %p to VNET\n", dev_name, vnet_nic); - - return v3_vnet_add_dev(vm, mac, &vnet_dev_ops, (void *)vnet_nic); -} - - static int str2mac(char * macstr, char mac[6]){ char hex[2], *s = macstr; int i = 0; @@ -162,7 +154,7 @@ static int str2mac(char * macstr, char mac[6]){ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct vnet_nic_state * vnetnic = NULL; - char * name = v3_cfg_val(cfg, "name"); + char * dev_id = v3_cfg_val(cfg, "ID"); char * macstr = NULL; char mac[6]; int vnet_dev_id; @@ -170,19 +162,18 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); macstr = v3_cfg_val(frontend_cfg, "mac"); - if (macstr == NULL) { - PrintDebug("Vnet-nic: No Mac specified\n"); - } else { + if (macstr != NULL) { + PrintDebug("Vnet-nic: Mac specified %s\n", macstr); str2mac(macstr, mac); } vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state)); memset(vnetnic, 0, sizeof(struct vnet_nic_state)); - struct vm_device * dev = v3_allocate_device(name, &dev_ops, vnetnic); - - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, vnetnic); + if (dev == NULL) { + PrintError("Could not attach device %s\n", dev_id); + V3_Free(vnetnic); return -1; } @@ -195,20 +186,23 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), &(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) { PrintError("Could not connect %s to frontend %s\n", - name, v3_cfg_val(frontend_cfg, "tag")); + dev_id, v3_cfg_val(frontend_cfg, "tag")); + v3_remove_device(dev); return -1; } PrintDebug("Vnet-nic: Connect %s to frontend %s\n", - name, v3_cfg_val(frontend_cfg, "tag")); + dev_id, v3_cfg_val(frontend_cfg, "tag")); - if ((vnet_dev_id = register_to_vnet(vm, vnetnic, name, vnetnic->mac)) == -1) { - PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", name, macstr); + if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->mac, &vnet_dev_ops, (void *)vnetnic)) == -1) { + PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", dev_id, macstr); + v3_remove_device(dev); + return 0; } vnetnic->vnet_dev_id = vnet_dev_id; PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", - name, macstr, *((ulong_t *)vnetnic->mac)); + dev_id, macstr, *((ulong_t *)vnetnic->mac)); //for temporary hack for vnet bridge test @@ -216,7 +210,7 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { { uchar_t zeromac[6] = {0,0,0,0,0,0}; - if(!strcmp(name, "vnet_nic")){ + if(!strcmp(dev_id, "vnet_nic")){ struct v3_vnet_route route; route.dst_id = vnet_dev_id; @@ -245,16 +239,16 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { #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; uchar_t zeromac[6] = {0,0,0,0,0,0}; - if(!strcmp(name, "vnet_nic")){ //domu + if(!strcmp(dev_id, "vnet_nic")){ //domu vnet_nic_guestid = vnet_dev_id; } - if (!strcmp(name, "vnet_nic_dom0")){ + if (!strcmp(dev_id, "vnet_nic_dom0")){ vnet_nic_dom0 = vnet_dev_id; }