X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fio_apic.c;h=0817e9beaa811071fb7d1023f4672ecd04525fa9;hb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;hp=b0e9584142bd19e07db874942f38fd99cbbe9e6a;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios.git

diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c
index b0e9584..0817e9b 100644
--- a/palacios/src/devices/io_apic.c
+++ b/palacios/src/devices/io_apic.c
@@ -23,7 +23,7 @@
 #include <devices/apic.h>
 #include <palacios/vm_guest.h>
 
-#ifndef CONFIG_DEBUG_IO_APIC
+#ifndef V3_CONFIG_DEBUG_IO_APIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -136,6 +136,10 @@ struct io_apic_state {
     struct redir_tbl_entry redir_tbl[24];
 
     void * apic_dev_data;
+
+    void * router_handle;
+
+    struct v3_vm_info * vm;
   
 };
 
@@ -273,7 +277,7 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
     if (irq_entry->mask == 0) {
 	struct v3_gen_ipi ipi;
 
-	PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", 
+	PrintDebug("ioapic %u: IOAPIC Signaling APIC to raise INTR %d\n", 
 		   ioapic->ioapic_id.id, irq_entry->vec);
 
 
@@ -284,6 +288,9 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
 	ipi.dst = irq_entry->dst_field;
 	ipi.dst_shorthand = 0;
 
+
+	PrintDebug("ioapic %u: IPI: vector 0x%x, mode 0x%x, logical 0x%x, trigger 0x%x, dst 0x%x, shorthand 0x%x\n",
+		   ioapic->ioapic_id.id, ipi.vector, ipi.mode, ipi.logical, ipi.trigger_mode, ipi.dst, ipi.dst_shorthand);
 	// Need to add destination argument here...
 	if (v3_apic_send_ipi(vm, &ipi, ioapic->apic_dev_data) == -1) {
 	    PrintError("Error sending IPI to apic %d\n", ipi.dst);
@@ -309,7 +316,7 @@ static struct intr_router_ops router_ops = {
 
 static int io_apic_free(struct io_apic_state * ioapic) {
 
-    // unregister intr router
+    v3_remove_intr_router(ioapic->vm, ioapic->router_handle);
 
     // unhook memory
 
@@ -318,10 +325,42 @@ static int io_apic_free(struct io_apic_state * ioapic) {
     return 0;
 }
 
+#ifdef V3_CONFIG_CHECKPOINT
+static int io_apic_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct io_apic_state * io_apic = (struct io_apic_state *)private_data;
+
+    V3_CHKPT_STD_SAVE(ctx, io_apic->base_addr);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->index_reg);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_id);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_ver);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_arb_id);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->redir_tbl);
+
+    return 0;
+}
+
+static int io_apic_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct io_apic_state * io_apic = (struct io_apic_state *)private_data;
+
+    V3_CHKPT_STD_LOAD(ctx, io_apic->base_addr);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->index_reg);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_id);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_ver);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_arb_id);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->redir_tbl);
+
+    return 0;
+}
+#endif
+
+
 
 static struct v3_device_ops dev_ops = {
     .free = (int (*)(void *))io_apic_free,
-
+#ifdef V3_CONFIG_CHECKPOINT
+    .save = io_apic_save, 
+    .load = io_apic_load
+#endif
 };
 
 
@@ -345,7 +384,8 @@ static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	return -1;
     }
 
-    v3_register_intr_router(vm, &router_ops, ioapic);
+    ioapic->router_handle = v3_register_intr_router(vm, &router_ops, ioapic);
+    ioapic->vm = vm;
 
     init_ioapic_state(ioapic, vm->num_cores);