Cleanup based on cppcheck pass (Devices and Extensions)

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

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index da26d6b..510d08a 100644 (file)
--- a/palacios/src/devices/i440fx.c
+++ b/palacios/src/devices/i440fx.c
@@ -18,9 +18,12 @@
  */
 
 #include <palacios/vmm.h>
+#include <palacios/vm_guest.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/pci.h>
 
+#include <palacios/vmm_io.h>
+
 
 // We Have to setup some sort of PIC interrupt mapping here....
 
@@ -29,13 +32,13 @@ struct i440_state {
 };
 
 
-static int io_read(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    PrintError("Unhandled read on port %x\n", port);
+static int io_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    PrintError(core->vm_info, core, "Unhandled read on port %x\n", port);
     return -1;
 }
 
-static int io_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    PrintError("Unhandled write on port %x\n", port);
+static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    PrintError(core->vm_info, core, "Unhandled write on port %x\n", port);
     return -1;
 }
 
@@ -43,49 +46,63 @@ static int io_write(ushort_t port, void * src, uint_t length, struct vm_device *
 
 
 
-static int i440_free(struct vm_device * dev) {
+static int i440_free(struct i440_state * state) {
+
+    // unregister from PCI
+
+    V3_Free(state);
+
     return 0;
 }
 
 static struct v3_device_ops dev_ops = {
-    .free = i440_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))i440_free,
+
 };
 
 
 
 
-static int i440_init(struct guest_info * vm, void * cfg_data) {
+static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct pci_device * pci_dev = NULL;
     struct v3_pci_bar bars[6];
     int i;
     struct i440_state * state = NULL;
-    struct vm_device * pci = v3_find_dev(vm, (char *)cfg_data);
+    struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
+    char * dev_id = v3_cfg_val(cfg, "ID");
+    int ret = 0;
 
     if (!pci) {
-       PrintError("could not find PCI Device\n");
+       PrintError(vm, VCORE_NONE, "could not find PCI Device\n");
        return -1;
     }
 
     state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
 
+    if (!state) {
+       PrintError(vm, VCORE_NONE, "Cannot allocate state\n");
+       return -1;
+    }
+
     state->pci = pci;
        
-    struct vm_device * dev = v3_allocate_device("i440FX", &dev_ops, state);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
 
-    if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", "i440FX");
+    if (dev == NULL) {
+       PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
+       V3_Free(state);
        return -1;
     }
 
-
     for (i = 0; i < 4; i++) {
-       v3_dev_hook_io(dev, 0x0cf8 + i,
-                      &io_read, &io_write);
-       v3_dev_hook_io(dev, 0x0cfc + i,
-                      &io_read, &io_write);
+       ret |= v3_dev_hook_io(dev, 0x0cf8 + i, &io_read, &io_write);
+       ret |= v3_dev_hook_io(dev, 0x0cfc + i, &io_read, &io_write);
+    }
+
+    if (ret != 0) {
+       PrintError(vm, VCORE_NONE, "Error hooking i440FX io ports\n");
+       //v3_remove_device(dev);
+       //return -1;
     }
 
     for (i = 0; i < 6; i++) {
@@ -94,9 +111,10 @@ static int i440_init(struct guest_info * vm, void * cfg_data) {
 
     pci_dev = v3_pci_register_device(state->pci, PCI_STD_DEVICE, 
                                     0, 0, 0, "i440FX", bars,
-                                    NULL, NULL, NULL, dev, NULL);
+                                    NULL, NULL, NULL, NULL, state);
 
     if (!pci_dev) {
+       v3_remove_device(dev);
        return -1;
     }
 
@@ -111,4 +129,4 @@ static int i440_init(struct guest_info * vm, void * cfg_data) {
     return 0;
 }
 
-device_register("i440FX", i440_init)
+device_register("i440FX", i440_init);