X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=b945d2b2ffceefc887d60812c6400edb0b276213;hb=0dc44b36f3d1f95efe8fe96484e76e65aeebd197;hp=e5498b9eefe7ae4c2e1d26ad11fec53315238577;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios-OLD.git

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index e5498b9..b945d2b 100644
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -299,10 +299,13 @@ static void pit_update_timer(struct guest_info * info, ullong_t cpu_cycles, ullo
 	// update counter with remainder (mod reload)
 	state->pit_counter = state->pit_reload - cpu_cycles;    
 
-	//PrintDebug("8254 PIT: Handling %d crystal tics\n", oscillations);
+	if (oscillations) {
+	    PrintDebug("8254 PIT: Handling %d crystal tics\n", oscillations);
+	}
+
 	if (handle_crystal_tics(state, &(state->ch_0), oscillations) == 1) {
 	    // raise interrupt
-	    PrintDebug("8254 PIT: Injecting Timer interrupt to guest\n");
+	    // PrintDebug("8254 PIT: Injecting Timer interrupt to guest\n");
 	    v3_raise_irq(info->vm_info, 0);
 	}
 
@@ -657,11 +660,66 @@ static int pit_free(void * private_data) {
     return 0;
 }
 
+#ifdef CONFIG_KEYED_STREAMS
+static int pit_checkpoint(struct vm_device *dev, v3_keyed_stream_t stream)
+{
+    struct pit *p = (struct pit *) (dev->private_data);
 
-static struct v3_device_ops dev_ops = {
-    .free = (int (*)(void *))pit_free,
+    v3_keyed_stream_key_t ks;
+
+    ks = v3_keyed_stream_open_key(stream,dev->name);
+
+    if (!ks) { 
+	return -1;
+    }
+
+    STD_SAVE(stream,ks,p->pit_counter);
+    STD_SAVE(stream,ks,p->pit_reload);
+    STD_SAVE(stream,ks,p->ch_0);
+    STD_SAVE(stream,ks,p->ch_1);
+    STD_SAVE(stream,ks,p->ch_2);
+    STD_SAVE(stream,ks,p->speaker);
+
+    v3_keyed_stream_close_key(stream,ks);
+    
+    return 0;
+
+
+}
+
+static int pit_restore(struct vm_device *dev, v3_keyed_stream_t stream)
+{
+    struct pit *p = (struct pit *) (dev->private_data);
 
+    v3_keyed_stream_key_t ks;
 
+    ks = v3_keyed_stream_open_key(stream,dev->name);
+
+    if (!ks) { 
+	return -1;
+    }
+
+    STD_LOAD(stream,ks,p->pit_counter);
+    STD_LOAD(stream,ks,p->pit_reload);
+    STD_LOAD(stream,ks,p->ch_0);
+    STD_LOAD(stream,ks,p->ch_1);
+    STD_LOAD(stream,ks,p->ch_2);
+    STD_LOAD(stream,ks,p->speaker);
+
+    v3_keyed_stream_close_key(stream,ks);
+    
+    return 0;
+
+
+}
+#endif
+
+static struct v3_device_ops dev_ops = {
+    .free = (int (*)(void *))pit_free,
+#ifdef CONFIG_KEYED_STREAMS
+    .checkpoint = pit_checkpoint,
+    .restore = pit_restore,
+#endif
 };
 
 #include <palacios/vm_guest.h>
@@ -676,12 +734,14 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     // just hardcode the core context
     struct guest_info * info = &(vm->cores[0]);
 
-    uint_t cpu_khz = V3_CPU_KHZ();
+    uint_t cpu_khz = info->time_state.guest_cpu_freq;
     ullong_t reload_val = (ullong_t)cpu_khz * 1000;
 
     pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
+
     V3_ASSERT(pit_state != NULL);
     pit_state->speaker = 0;
+    pit_state->vm = vm;
 
     dev = v3_add_device(vm, dev_id, &dev_ops, pit_state);