/* 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;
{
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);
+ v3_hexdump(buf, len, NULL, 0);
}
#endif
}
-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 = {
.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;
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(dev_id, &dev_ops, vnetnic);
-
- if (v3_attach_device(vm, dev) == -1) {
+ 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;
}
&(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(dev);
return -1;
}
PrintDebug("Vnet-nic: Connect %s to frontend %s\n",
dev_id, v3_cfg_val(frontend_cfg, "tag"));
- if ((vnet_dev_id = register_to_vnet(vm, vnetnic, dev_id, vnetnic->mac)) == -1) {
+ 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;
//for temporary hack for vnet bridge test
-#if 1
+#if 0
{
uchar_t zeromac[6] = {0,0,0,0,0,0};