X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fi440fx.c;h=618a8ca6df22487f21efdfb39fafd7b0896cba34;hb=0aed29b0f8c93d2bef57d589e8bf058445e89fc2;hp=da26d6b4cb8227736d994a2149ccb26a4dc2b24e;hpb=3a4e54ec208ea3589963b410d2d73292bbc4a8fe;p=palacios.git

diff --git a/palacios/src/devices/i440fx.c b/palacios/src/devices/i440fx.c
index da26d6b..618a8ca 100644
--- a/palacios/src/devices/i440fx.c
+++ b/palacios/src/devices/i440fx.c
@@ -29,12 +29,12 @@ struct i440_state {
 };
 
 
-static int io_read(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int io_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
     PrintError("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) {
+static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
     PrintError("Unhandled write on port %x\n", port);
     return -1;
 }
@@ -57,12 +57,13 @@ static struct v3_device_ops dev_ops = {
 
 
 
-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 * name = v3_cfg_val(cfg, "name");
 
     if (!pci) {
 	PrintError("could not find PCI Device\n");
@@ -73,10 +74,10 @@ static int i440_init(struct guest_info * vm, void * cfg_data) {
 
     state->pci = pci;
 	
-    struct vm_device * dev = v3_allocate_device("i440FX", &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", "i440FX");
+	PrintError("Could not attach device %s\n", name);
 	return -1;
     }
 
@@ -94,7 +95,7 @@ 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, dev);
 
     if (!pci_dev) {
  	return -1;