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

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

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index f1fc628..800633f 100644 (file)
--- a/palacios/src/devices/i440fx.c
+++ b/palacios/src/devices/i440fx.c
@@ -45,8 +45,7 @@ static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t
 
 
 
-static int i440_free(struct vm_device * dev) {
-    struct i440_state * state = dev->private_data;
+static int i440_free(struct i440_state * state) {
 
     // unregister from PCI
 
@@ -56,7 +55,7 @@ static int i440_free(struct vm_device * dev) {
 }
 
 static struct v3_device_ops dev_ops = {
-    .free = i440_free,
+    .free = (int (*)(void *))i440_free,
 
 };
 
@@ -79,6 +78,11 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
 
+    if (!state) {
+       PrintError("Cannot allocate state\n");
+       return -1;
+    }
+
     state->pci = pci;
        
     struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
@@ -108,7 +112,7 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     pci_dev = v3_pci_register_device(state->pci, PCI_STD_DEVICE, 
                                     0, 0, 0, "i440FX", bars,
-                                    NULL, NULL, NULL, state);
+                                    NULL, NULL, NULL, NULL, state);
 
     if (!pci_dev) {
        v3_remove_device(dev);