X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=51037917fbd9df465fcd87d6c96a4d3e16d6374d;hp=0d5e5ffdf09c62f72fff889981301b38cde056d7;hb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;hpb=268cdc635ece417c3472295c4c81591564c6e0df

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index 0d5e5ff..5103791 100644
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -25,7 +25,7 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vm_guest.h>
 
-#ifndef CONFIG_DEBUG_PIC
+#ifndef V3_CONFIG_DEBUG_PIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -216,7 +216,7 @@ static int pic_raise_intr(struct v3_vm_info * vm, void * private_data, int irq)
 	return -1;
     }
 
-#ifdef CONFIG_MULTITHREAD_OS
+#ifdef V3_CONFIG_MULTITHREAD_OS
     v3_interrupt_cpu(vm, 0, 0);
 #endif
 
@@ -737,10 +737,96 @@ static int pic_free(struct pic_internal * state) {
     return 0;
 }
 
+#ifdef V3_CONFIG_CHECKPOINT
+static int pic_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct pic_internal * pic = (struct pic_internal *)private_data;
+
+    V3_CHKPT_STD_SAVE(ctx, pic->master_irr);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_irr);
+  
+    V3_CHKPT_STD_SAVE(ctx, pic->master_isr);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_isr);
+
+    V3_CHKPT_STD_SAVE(ctx, pic->master_elcr);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_elcr);
+    V3_CHKPT_STD_SAVE(ctx, pic->master_elcr_mask);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_elcr_mask);
+
+    V3_CHKPT_STD_SAVE(ctx, pic->master_icw1);
+    V3_CHKPT_STD_SAVE(ctx, pic->master_icw2);
+    V3_CHKPT_STD_SAVE(ctx, pic->master_icw3);
+    V3_CHKPT_STD_SAVE(ctx, pic->master_icw4);
+
+
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_icw1);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_icw2);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_icw3);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_icw4);
+
+
+    V3_CHKPT_STD_SAVE(ctx, pic->master_imr);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_imr);
+    V3_CHKPT_STD_SAVE(ctx, pic->master_ocw2);
+    V3_CHKPT_STD_SAVE(ctx, pic->master_ocw3);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_ocw2);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_ocw3);
+
+    V3_CHKPT_STD_SAVE(ctx, pic->master_state);
+    V3_CHKPT_STD_SAVE(ctx, pic->slave_state);
+
+    
+    return 0;
+
+}
+
+static int pic_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct pic_internal * pic = (struct pic_internal *)private_data;
+
+    V3_CHKPT_STD_LOAD(ctx, pic->master_irr);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_irr);
+  
+    V3_CHKPT_STD_LOAD(ctx, pic->master_isr);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_isr);
+
+    V3_CHKPT_STD_LOAD(ctx, pic->master_elcr);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_elcr);
+    V3_CHKPT_STD_LOAD(ctx, pic->master_elcr_mask);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_elcr_mask);
+
+    V3_CHKPT_STD_LOAD(ctx, pic->master_icw1);
+    V3_CHKPT_STD_LOAD(ctx, pic->master_icw2);
+    V3_CHKPT_STD_LOAD(ctx, pic->master_icw3);
+    V3_CHKPT_STD_LOAD(ctx, pic->master_icw4);
+
+
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_icw1);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_icw2);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_icw3);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_icw4);
+
+
+    V3_CHKPT_STD_LOAD(ctx, pic->master_imr);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_imr);
+    V3_CHKPT_STD_LOAD(ctx, pic->master_ocw2);
+    V3_CHKPT_STD_LOAD(ctx, pic->master_ocw3);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_ocw2);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_ocw3);
+
+    V3_CHKPT_STD_LOAD(ctx, pic->master_state);
+    V3_CHKPT_STD_LOAD(ctx, pic->slave_state);
+
+    return 0;
+}
+
+#endif
+
 
 static struct v3_device_ops dev_ops = {
     .free = (int (*)(void *))pic_free,
-
+#ifdef V3_CONFIG_CHECKPOINT
+    .save = pic_save,
+    .load = pic_load
+#endif
 };