X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=31c026d32f0ee9c71c8aa02875962438a0103ac5;hb=b42be88af0bc84e967d06820ebc9a86a67e2bebc;hp=d66384dd61c11a8eade37c79bdaea070d88196f1;hpb=020108512c01b113a5e8cca88a8facdc5ba5488a;p=palacios.git

diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c
index d66384d..31c026d 100644
--- a/palacios/src/devices/vnet_nic.c
+++ b/palacios/src/devices/vnet_nic.c
@@ -111,12 +111,23 @@ 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");
 
+    if (!frontend_cfg || !(v3_cfg_val(frontend_cfg, "tag"))) { 
+	PrintError(vm, VCORE_NONE, "No frontend config specified, or frontend has no tag\n");
+	return -1;
+    }
+
     vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state));
+
+    if (!vnetnic) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate in init\n");
+	return -1;
+    }
+
     memset(vnetnic, 0, sizeof(struct vnet_nic_state));
 
     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);
+	PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
 	V3_Free(vnetnic);
 	return -1;
     }
@@ -126,19 +137,19 @@ 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", 
+	PrintError(vm, VCORE_NONE, "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", 
+    PrintDebug(vm, VCORE_NONE, "Vnet-nic: Connect %s to frontend %s\n", 
 	       dev_id, v3_cfg_val(frontend_cfg, "tag"));
 
     if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.config.fnt_mac, 
 				       &vnet_dev_ops, vnetnic->net_ops.config.quote, 
 				       vnetnic->net_ops.config.poll, (void *)vnetnic)) == -1) {
-	PrintError("Vnet-nic device %s fails to registered to VNET\n", dev_id);
+	PrintError(vm, VCORE_NONE, "Vnet-nic device %s fails to registered to VNET\n", dev_id);
 	
 	v3_remove_device(dev);
 	return 0;