X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fi440fx.c;h=510d08ac04dc0d388df2886c4a327405d00c56d2;hb=2282a040e60b24d3fb7c48bb197c5bff6636df67;hp=6c587d3eedaf72108f3834475a4e564590a02925;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios.git

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index 6c587d3..510d08a 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;
 }
 
@@ -72,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;
     }
@@ -93,13 +99,11 @@ static int i440_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	ret |= v3_dev_hook_io(dev, 0x0cfc + i, &io_read, &io_write);
     }
 
-    /*
     if (ret != 0) {
-	PrintError("Error hooking i440FX io ports\n");
-	v3_remove_device(dev);
-	return -1;
+	PrintError(vm, VCORE_NONE, "Error hooking i440FX io ports\n");
+	//v3_remove_device(dev);
+	//return -1;
     }
-    */
 
     for (i = 0; i < 6; i++) {
 	bars[i].type = PCI_BAR_NONE;
@@ -107,7 +111,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);