X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=3cdc298910b156c4ae54823657e7826ee90b6461;hb=e70e95962c26832628d586e07f9cd1a2e1852d72;hp=bf27ca0dbbac7cf7b24327d27abbbf227559aa9b;hpb=f4b430cdef58c5d13260c57f46a077c07c72864e;p=palacios.git diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c index bf27ca0..3cdc298 100644 --- a/palacios/src/devices/generic.c +++ b/palacios/src/devices/generic.c @@ -1,6 +1,23 @@ -/* (c) 2008, Peter Dinda */ -/* (c) 2008, The V3VEE Project */ - +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Peter Dinda + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Peter Dinda + * Contributor: 2008, Jack Lange + * + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ #include #include @@ -21,11 +38,11 @@ struct generic_internal { - struct list_head port_range; + struct list_head port_list; uint_t num_port_ranges; - struct list_head mem_range; + struct list_head mem_list; uint_t num_mem_ranges; - struct list_head irq_range; + struct list_head irq_list; uint_t num_irq_ranges; }; @@ -34,21 +51,21 @@ struct port_range { uint_t start; uint_t end; uint_t type; - struct list_head range_list; + struct list_head range_link; }; struct mem_range { void * start; void * end; uint_t type; - struct list_head range_list; + struct list_head range_link; }; struct irq_range { uint_t start; uint_t end; uint_t type; - struct list_head range_list; + struct list_head range_link; }; @@ -99,7 +116,6 @@ int generic_write_port_passthrough(ushort_t port, switch (length) { case 1: - v3_outb(port,((uchar_t*)src)[0]); break; case 2: @@ -107,7 +123,6 @@ int generic_write_port_passthrough(ushort_t port, break; case 4: v3_outdw(port,((uint_t*)src)[0]); - break; default: for (i = 0; i < length; i++) { @@ -209,9 +224,9 @@ int generic_init_device(struct vm_device * dev) { if (PORT_HOOKS) { // This is a runtime conditional on a #define - struct port_range * tmp; + struct port_range * tmp = NULL; - list_for_each_entry(tmp, &(state->port_range), range_list) { + list_for_each_entry(tmp, &(state->port_list), range_link) { uint_t i = 0; PrintDebug("generic: hooking ports 0x%x to 0x%x as %x\n", @@ -243,7 +258,7 @@ int generic_init_device(struct vm_device * dev) { if (MEM_HOOKS) { // This is a runtime conditional on a #define struct mem_range * tmp; - list_for_each_entry(tmp, &(state->mem_range), range_list) { + list_for_each_entry(tmp, &(state->mem_list), range_link) { PrintDebug("generic: hooking addresses 0x%x to 0x%x\n", tmp->start, tmp->end); @@ -264,7 +279,7 @@ int generic_init_device(struct vm_device * dev) { if (IRQ_HOOKS) { // This is a runtime conditional on a #define struct irq_range * tmp; - list_for_each_entry(tmp, &(state->irq_range), range_list) { + list_for_each_entry(tmp, &(state->irq_list), range_link) { uint_t i; PrintDebug("generic: hooking irqs 0x%x to 0x%x\n", @@ -297,7 +312,7 @@ int generic_deinit_device(struct vm_device * dev) { struct irq_range * tmp; struct irq_range * cur; - list_for_each_entry_safe(cur, tmp, &(state->irq_range), range_list) { + list_for_each_entry_safe(cur, tmp, &(state->irq_list), range_link) { uint_t i; PrintDebug("generic: unhooking irqs 0x%x to 0x%x\n", @@ -310,6 +325,8 @@ int generic_deinit_device(struct vm_device * dev) { } } + list_del(&(cur->range_link)); + state->num_irq_ranges--; V3_Free(cur); } } else { @@ -321,7 +338,7 @@ int generic_deinit_device(struct vm_device * dev) { struct mem_range * tmp; struct mem_range * cur; - list_for_each_entry_safe(cur, tmp, &(state->mem_range), range_list) { + list_for_each_entry_safe(cur, tmp, &(state->mem_list), range_link) { PrintDebug("generic: unhooking addresses 0x%x to 0x%x\n", cur->start, cur->end); @@ -331,6 +348,8 @@ int generic_deinit_device(struct vm_device * dev) { cur->start, cur->end); } + list_del(&(cur->range_link)); + state->num_mem_ranges--; V3_Free(cur); } } else { @@ -342,7 +361,7 @@ int generic_deinit_device(struct vm_device * dev) { struct port_range * tmp; struct port_range * cur; - list_for_each_entry_safe(cur, tmp, &(state->mem_range), range_list) { + list_for_each_entry_safe(cur, tmp, &(state->port_list), range_link) { uint_t i; PrintDebug("generic: unhooking ports 0x%x to 0x%x\n", @@ -354,6 +373,8 @@ int generic_deinit_device(struct vm_device * dev) { } } + list_del(&(cur->range_link)); + state->num_port_ranges--; V3_Free(cur); } } else { @@ -391,7 +412,12 @@ int v3_generic_add_port_range(struct vm_device * dev, uint_t start, uint_t end, range->end = end; range->type = type; - list_add(&(state->port_range), &(range->range_list)); + + PrintDebug("generic: Adding Port Range: 0x%x to 0x%x as %x\n", + range->start, range->end, + (range->type == GENERIC_PRINT_AND_PASSTHROUGH) ? "print-and-passthrough" : "print-and-ignore"); + + list_add(&(range->range_link), &(state->port_list)); state->num_port_ranges++; } else { PrintDebug("generic: hooking IO ports not supported\n"); @@ -411,7 +437,7 @@ int v3_generic_add_mem_range(struct vm_device * dev, void * start, void * end, u range->end = end; range->type = type; - list_add(&(state->port_range), &(range->range_list)); + list_add(&(range->range_link), &(state->port_list)); state->num_mem_ranges++; } else { PrintDebug("generic: hooking memory not supported\n"); @@ -432,7 +458,7 @@ int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, u range->end = end; range->type = type; - list_add(&(state->port_range), &(range->range_list)); + list_add(&(range->range_link), &(state->port_list)); state->num_irq_ranges++; } else { PrintDebug("generic: hooking IRQs not supported\n"); @@ -444,16 +470,16 @@ int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, u -struct vm_device *create_generic() { +struct vm_device * create_generic() { struct generic_internal * generic_state = (struct generic_internal *)V3_Malloc(sizeof(struct generic_internal)); generic_state->num_port_ranges = 0; generic_state->num_mem_ranges = 0; generic_state->num_irq_ranges = 0; - INIT_LIST_HEAD(&(generic_state->port_range)); - INIT_LIST_HEAD(&(generic_state->mem_range)); - INIT_LIST_HEAD(&(generic_state->irq_range)); + INIT_LIST_HEAD(&(generic_state->port_list)); + INIT_LIST_HEAD(&(generic_state->mem_list)); + INIT_LIST_HEAD(&(generic_state->irq_list)); struct vm_device * device = create_device("GENERIC", &dev_ops, generic_state);