X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=3d7f7925f01cef1188016a1e21b1406e0c8a0a5e;hb=16745fa0dd0900263d4d92315cd17e0ed9ccae91;hp=18273669dc2d3c0e5707d7b25bedc8d7d1e81a4f;hpb=1df601c90b519a54b64ca101fd6aa4c0a39bf0f0;p=palacios.git

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 1827366..3d7f792 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -33,14 +33,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_APIC
-static char *shorthand_str[] = { 
+static char * shorthand_str[] = { 
     "(no shorthand)",
     "(self)",
     "(all)",
     "(all-but-me)",
 };
 
-static char *deliverymode_str[] = { 
+static char * deliverymode_str[] = { 
     "(fixed)",
     "(lowest priority)",
     "(SMI)",
@@ -1290,9 +1290,8 @@ static int apic_get_intr_number(struct guest_info * core, void * private_data) {
 }
 
 
-int v3_apic_send_ipi(struct v3_vm_info * vm, struct vm_device * dev, 
-		     struct v3_gen_ipi * ipi) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev->private_data);
+int v3_apic_send_ipi(struct v3_vm_info * vm, struct v3_gen_ipi * ipi, void * dev_data) {
+    struct apic_dev_state * apic_dev = (struct apic_dev_state *)dev_data;
     struct int_cmd_reg tmp_icr;
 
     // zero out all the fields
@@ -1311,9 +1310,8 @@ int v3_apic_send_ipi(struct v3_vm_info * vm, struct vm_device * dev,
 }
 
 
-int v3_apic_raise_intr(struct v3_vm_info * vm, struct vm_device * dev, 
-		       uint32_t irq, uint32_t dst) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev->private_data);
+int v3_apic_raise_intr(struct v3_vm_info * vm, uint32_t irq, uint32_t dst, void * dev_data) {
+    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev_data);
     struct apic_state * apic = &(apic_dev->apics[dst]); 
 
     PrintDebug("apic %u core ?: raising interrupt IRQ %u (dst = %u).\n", apic->lapic_id.val, irq, dst); 
@@ -1464,14 +1462,15 @@ static struct v3_timer_ops timer_ops = {
 
 
 
-static int apic_free(struct vm_device * dev) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)dev->private_data;
+static int apic_free(struct apic_dev_state * apic_dev) {
     int i = 0;
+    struct v3_vm_info * vm = NULL;
 
-    for (i = 0; i < dev->vm->num_cores; i++) {
+    for (i = 0; i < apic_dev->num_apics; i++) {
 	struct apic_state * apic = &(apic_dev->apics[i]);
-	struct guest_info * core = &(dev->vm->cores[i]);
+	struct guest_info * core = apic->core;
 	
+	vm = core->vm_info;
 
 	// unregister intr controller
 
@@ -1483,7 +1482,7 @@ static int apic_free(struct vm_device * dev) {
 
     }
 
-    v3_unhook_msr(dev->vm, BASE_ADDR_MSR);
+    v3_unhook_msr(vm, BASE_ADDR_MSR);
 
     V3_Free(apic_dev);
     return 0;
@@ -1491,10 +1490,7 @@ static int apic_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = apic_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))apic_free,
 };
 
 
@@ -1513,9 +1509,9 @@ static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     apic_dev->num_apics = vm->num_cores;
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, apic_dev);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, apic_dev);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
 	PrintError("apic: Could not attach device %s\n", dev_id);
 	V3_Free(apic_dev);
 	return -1;
@@ -1536,7 +1532,7 @@ static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
 	if (apic->timer == NULL) {
 	    PrintError("APIC: Failed to attach timer to core %d\n", i);
-	    v3_detach_device(dev);
+	    v3_remove_device(dev);
 	    return -1;
 	}