X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=b7d1a181001368de960bf16ee7e17a680bb2341a;hb=16047acf61f82cb4ae33bcb84b221c2098215172;hp=ec78bb9517e0ed6998f57c460cb0e209f052372f;hpb=ec660ce1c5410ef08a7820f7ee064a30b416a523;p=palacios-OLD.git diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c index ec78bb9..b7d1a18 100644 --- a/palacios/src/devices/generic.c +++ b/palacios/src/devices/generic.c @@ -37,35 +37,15 @@ typedef enum {GENERIC_IGNORE, GENERIC_PRINT_AND_IGNORE} generic_mode_t; struct generic_internal { - struct list_head port_list; - uint_t num_port_ranges; - -}; - - -struct port_range { - uint_t start; - uint_t end; - generic_mode_t mode; - struct list_head range_link; }; - static int generic_write_port_passthrough(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data) { uint_t i; - PrintDebug("generic: writing 0x"); - - for (i = 0; i < length; i++) { - PrintDebug("%x", ((uint8_t *)src)[i]); - } - - PrintDebug(" to port 0x%x ... ", port); - switch (length) { case 1: v3_outb(port, ((uint8_t *)src)[0]); @@ -82,18 +62,33 @@ static int generic_write_port_passthrough(struct guest_info * core, uint16_t por } } + return length; +} + +static int generic_write_port_print_and_passthrough(struct guest_info * core, uint16_t port, void * src, + uint_t length, void * priv_data) { + uint_t i; + int rc; + + PrintDebug("generic: writing 0x"); + + for (i = 0; i < length; i++) { + PrintDebug("%x", ((uint8_t *)src)[i]); + } + + PrintDebug(" to port 0x%x ... ", port); + + rc=generic_write_port_passthrough(core,port,src,length,priv_data); + PrintDebug(" done\n"); - return length; + return rc; } static int generic_read_port_passthrough(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data) { uint_t i; - PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port); - - switch (length) { case 1: ((uint8_t *)src)[0] = v3_inb(port); @@ -110,35 +105,42 @@ static int generic_read_port_passthrough(struct guest_info * core, uint16_t port } } + return length; +} + +static int generic_read_port_print_and_passthrough(struct guest_info * core, uint16_t port, void * src, + uint_t length, void * priv_data) { + uint_t i; + int rc; + + PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port); + + + rc=generic_read_port_passthrough(core,port,src,length,priv_data); + PrintDebug(" done ... read 0x"); - for (i = 0; i < length; i++) { + for (i = 0; i < rc; i++) { PrintDebug("%x", ((uint8_t *)src)[i]); } PrintDebug("\n"); - return length; + return rc; } -static int generic_write_port_ignore(struct guest_info * core, uint16_t port, void * src, - uint_t length, void * priv_data) { - int i; - PrintDebug("generic: writing 0x"); +static int generic_read_port_ignore(struct guest_info * core, uint16_t port, void * src, + uint_t length, void * priv_data) { + + memset((uint8_t *)src, 0, length); - for (i = 0; i < length; i++) { - PrintDebug("%x", ((uint8_t *)src)[i]); - } - - PrintDebug(" to port 0x%x ... ignored\n", port); - return length; } -static int generic_read_port_ignore(struct guest_info * core, uint16_t port, void * src, - uint_t length, void * priv_data) { - +static int generic_read_port_print_and_ignore(struct guest_info * core, uint16_t port, void * src, + uint_t length, void * priv_data) { + PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port); memset((uint8_t *)src, 0, length); @@ -147,33 +149,35 @@ static int generic_read_port_ignore(struct guest_info * core, uint16_t port, voi return length; } +static int generic_write_port_ignore(struct guest_info * core, uint16_t port, void * src, + uint_t length, void * priv_data) { + return length; +} +static int generic_write_port_print_and_ignore(struct guest_info * core, uint16_t port, void * src, + uint_t length, void * priv_data) { + int i; + PrintDebug("generic: writing 0x%x bytes to port 0x%x ", length, port); -static int generic_free(struct vm_device * dev) { - struct generic_internal * state = (struct generic_internal *)(dev->private_data); - struct port_range * tmp; - struct port_range * cur; + memset((uint8_t *)src, 0, length); + PrintDebug(" ignored - data was: 0x"); - PrintDebug("generic: deinit_device\n"); + for (i = 0; i < length; i++) { + PrintDebug("%x", ((uint8_t *)src)[i]); + } + + PrintDebug("\n"); - list_for_each_entry_safe(cur, tmp, &(state->port_list), range_link) { - uint_t i; + return length; +} - PrintDebug("generic: unhooking ports 0x%x to 0x%x\n", - cur->start, cur->end); - - for (i = cur->start; i <= cur->end; i++) { - if (v3_unhook_io_port(dev->vm, i)) { - PrintDebug("generic: can't unhook port 0x%x (already unhooked?)\n", i); - } - } - list_del(&(cur->range_link)); - state->num_port_ranges--; - V3_Free(cur); - } + + +static int generic_free(struct generic_internal * state) { + PrintDebug("generic: deinit_device\n"); V3_Free(state); return 0; @@ -184,45 +188,50 @@ static int generic_free(struct vm_device * dev) { static struct v3_device_ops dev_ops = { - .free = generic_free, + .free = (int (*)(void *))generic_free, }; static int add_port_range(struct vm_device * dev, uint_t start, uint_t end, generic_mode_t mode) { - struct generic_internal * state = (struct generic_internal *)(dev->private_data); - struct port_range * range = (struct port_range *)V3_Malloc(sizeof(struct port_range)); uint_t i = 0; - range->start = start; - range->end = end; - range->mode = mode; - PrintDebug("generic: Adding Port Range: 0x%x to 0x%x as %s\n", start, end, (mode == GENERIC_PRINT_AND_PASSTHROUGH) ? "print-and-passthrough" : "print-and-ignore"); for (i = start; i <= end; i++) { if (mode == GENERIC_PRINT_AND_PASSTHROUGH) { - if (v3_hook_io_port(dev->vm, i, - &generic_read_port_passthrough, - &generic_write_port_passthrough, dev) == -1) { + if (v3_dev_hook_io(dev, i, + &generic_read_port_print_and_passthrough, + &generic_write_port_print_and_passthrough) == -1) { PrintError("generic: can't hook port 0x%x (already hooked?)\n", i); return -1; } } else if (mode == GENERIC_PRINT_AND_IGNORE) { - if (v3_hook_io_port(dev->vm, i, + if (v3_dev_hook_io(dev, i, + &generic_read_port_print_and_ignore, + &generic_write_port_print_and_ignore) == -1) { + PrintError("generic: can't hook port 0x%x (already hooked?)\n", i); + return -1; + } + } else if (mode == GENERIC_PASSTHROUGH) { + if (v3_dev_hook_io(dev, i, + &generic_read_port_passthrough, + &generic_write_port_passthrough) == -1) { + PrintError("generic: can't hook port 0x%x (already hooked?)\n", i); + return -1; + } + } else if (mode == GENERIC_IGNORE) { + if (v3_dev_hook_io(dev, i, &generic_read_port_ignore, - &generic_write_port_ignore, dev) == -1) { + &generic_write_port_ignore) == -1) { PrintError("generic: can't hook port 0x%x (already hooked?)\n", i); return -1; } } } - - list_add(&(range->range_link), &(state->port_list)); - state->num_port_ranges++; return 0; } @@ -245,13 +254,10 @@ static int generic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } memset(state, 0, sizeof(struct generic_internal)); - - INIT_LIST_HEAD(&(state->port_list)); - state->num_port_ranges = 0; - struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state); - if (v3_attach_device(vm, dev) == -1) { + if (dev == NULL) { PrintError("Could not attach device %s\n", dev_id); V3_Free(state); return -1; @@ -270,15 +276,19 @@ static int generic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { mode = GENERIC_PRINT_AND_IGNORE; } else if (strcasecmp(mode_str, "print_and_passthrough") == 0) { mode = GENERIC_PRINT_AND_PASSTHROUGH; + } else if (strcasecmp(mode_str, "passthrough") == 0) { + mode = GENERIC_PASSTHROUGH; + } else if (strcasecmp(mode_str, "ignore") == 0) { + mode = GENERIC_IGNORE; } else { PrintError("Invalid Mode %s\n", mode_str); - v3_detach_device(dev); + v3_remove_device(dev); return -1; } if (add_port_range(dev, start, end, mode) == -1) { PrintError("Could not add port range %d-%d\n", start, end); - v3_detach_device(dev); + v3_remove_device(dev); return -1; }