X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fi440fx.c;h=a68e275a411f759ebe5c305d1ae059df5933ca31;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hp=f1fc6283a96bff04e4c76a8f65ebd0cbeb722159;hpb=5cb3cd9300bcd5bc7a79dc6c5d126c53a5a17c5a;p=palacios.git

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index f1fc628..a68e275 100644
--- a/palacios/src/devices/i440fx.c
+++ b/palacios/src/devices/i440fx.c
@@ -18,6 +18,7 @@
  */
 
 #include <palacios/vmm.h>
+#include <palacios/vm_guest.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/pci.h>
 
@@ -32,12 +33,12 @@ struct i440_state {
 
 
 static int io_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
-    PrintError("Unhandled read on port %x\n", port);
+    PrintError(core->vm_info, core, "Unhandled read on port %x\n", port);
     return -1;
 }
 
 static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
-    PrintError("Unhandled write on port %x\n", port);
+    PrintError(core->vm_info, core, "Unhandled write on port %x\n", port);
     return -1;
 }
 
@@ -45,8 +46,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 +56,7 @@ static int i440_free(struct vm_device * dev) {
 }
 
 static struct v3_device_ops dev_ops = {
-    .free = i440_free,
+    .free = (int (*)(void *))i440_free,
 
 };
 
@@ -73,18 +73,23 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     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_add_device(vm, dev_id, &dev_ops, state);
 
     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(state);
 	return -1;
     }
@@ -96,7 +101,7 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     /*
     if (ret != 0) {
-	PrintError("Error hooking i440FX io ports\n");
+	PrintError(vm, VCORE_NONE, "Error hooking i440FX io ports\n");
 	v3_remove_device(dev);
 	return -1;
     }
@@ -108,7 +113,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);