X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=924de7cfbfb84548fee54c6505360a7094b73c53;hb=7ee094e43dab15b0139847bca24cef904f8a42f6;hp=e4a00ff9d647ea2472d7afc6c4b044e8e5b4da44;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git

diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c
index e4a00ff..924de7c 100644
--- a/palacios/src/devices/generic.c
+++ b/palacios/src/devices/generic.c
@@ -76,7 +76,7 @@ static int generic_stop_device(struct vm_device * dev) {
 
 
 
-static int generic_write_port_passthrough(uint16_t port, void * src, 
+static int generic_write_port_passthrough(struct guest_info * core, uint16_t port, void * src, 
 					  uint_t length, struct vm_device * dev) {
     uint_t i;
 
@@ -109,7 +109,7 @@ static int generic_write_port_passthrough(uint16_t port, void * src,
     return length;
 }
 
-static int generic_read_port_passthrough(uint16_t port, void * src, 
+static int generic_read_port_passthrough(struct guest_info * core, uint16_t port, void * src, 
 					 uint_t length, struct vm_device * dev) {
     uint_t i;
 
@@ -143,7 +143,7 @@ static int generic_read_port_passthrough(uint16_t port, void * src,
     return length;
 }
 
-static int generic_write_port_ignore(uint16_t port, void * src, 
+static int generic_write_port_ignore(struct guest_info * core, uint16_t port, void * src, 
 				     uint_t length, struct vm_device * dev) {
     uint_t i;
 
@@ -158,7 +158,7 @@ static int generic_write_port_ignore(uint16_t port, void * src,
     return length;
 }
 
-static int generic_read_port_ignore(uint16_t port, void * src, 
+static int generic_read_port_ignore(struct guest_info * core, uint16_t port, void * src, 
 				    uint_t length, struct vm_device * dev) {
 
     PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port);
@@ -252,9 +252,9 @@ static int add_port_range(struct vm_device * dev, uint_t start, uint_t end, gene
 
 
 
-static int generic_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
+static int generic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct generic_internal * state = (struct generic_internal *)V3_Malloc(sizeof(struct generic_internal));
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     v3_cfg_tree_t * port_cfg = v3_cfg_subtree(cfg, "ports");
 
@@ -263,10 +263,10 @@ static int generic_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     state->num_port_ranges = 0;
 
     
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+	PrintError("Could not attach device %s\n", dev_id);
 	return -1;
     }