Lots of pedantic error checking in Palacios proper, especially for memory

[palacios.git] / palacios / src / devices / para_net.c

diff --git a/palacios/src/devices/para_net.c b/palacios/src/devices/para_net.c
index 13c5524..74b4466 100644 (file)
--- a/palacios/src/devices/para_net.c
+++ b/palacios/src/devices/para_net.c
@@ -39,6 +39,11 @@ static int tx_call(struct guest_info * info, uint_t call_no, void * priv_data) {
     addr_t pkt_gpa = info->vm_regs.rbx;
     int pkt_len = info->vm_regs.rcx;
     uchar_t * pkt = V3_Malloc(pkt_len);
+
+    if (!pkt) {
+       PrintError("Cannot allocate in transmit!\n");
+       return -1;
+    }
     
     PrintDebug("Transmitting Packet\n");
     
@@ -100,17 +105,23 @@ static struct v3_device_ops dev_ops = {
 
 
 
-static int net_init(struct guest_info * vm, void * cfg_data) {
+static int net_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     struct nic_state * state = NULL;
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     state = (struct nic_state *)V3_Malloc(sizeof(struct nic_state));
 
+    if (!state) {
+       PrintError("Cannot allocate in init\n");
+       return -1;
+    }
+
     PrintDebug("Creating VMNet Device\n");
 
-    struct vm_device * dev = v3_allocate_device("VMNET", &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-        PrintError("Could not attach device %s\n", "VMNET");
+        PrintError("Could not attach device %s\n", dev_id);
         return -1;
     }