X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=e01eeda68e2c78a961ef4178fe79d7050913a97d;hb=9b42eba2271981b4642c83cb520b68fe15f270fb;hp=028357fda9c2573c0d736185d3b6f225b920a9fd;hpb=e2964f7234daa3429275c039769a313f0870c212;p=palacios-OLD.git

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 028357f..e01eeda 100644
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -27,7 +27,7 @@
 #include <palacios/vmm_io.h>
 
 
-#ifndef CONFIG_DEBUG_PIT
+#ifndef V3_CONFIG_DEBUG_PIT
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -89,6 +89,8 @@ struct pit {
 
     struct v3_timer * timer;
 
+    struct v3_vm_info * vm;
+
     struct channel ch_0;
     struct channel ch_1;
     struct channel ch_2;
@@ -297,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);
 	}
 
@@ -642,9 +647,9 @@ static void init_channel(struct channel * ch) {
 
 
 
-static int pit_free(struct vm_device * dev) {
-    struct pit * state = (struct pit *)dev->private_data;
-    struct guest_info * info = &(dev->vm->cores[0]);
+static int pit_free(void * private_data) {
+    struct pit * state = (struct pit *)private_data;
+    struct guest_info * info = &(state->vm->cores[0]);
 
 
     if (state->timer) {
@@ -655,11 +660,66 @@ static int pit_free(struct vm_device * dev) {
     return 0;
 }
 
+#ifdef V3_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 = 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 V3_CONFIG_KEYED_STREAMS
+    .checkpoint = pit_checkpoint,
+    .restore = pit_restore,
+#endif
 };
 
 #include <palacios/vm_guest.h>
@@ -674,16 +734,18 @@ 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_allocate_device(dev_id, &dev_ops, pit_state);
+    dev = v3_add_device(vm, dev_id, &dev_ops, pit_state);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
 	PrintError("Could not attach device %s\n", dev_id);
 	V3_Free(pit_state);
 	return -1;
@@ -697,11 +759,11 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     if (ret != 0) {
 	PrintError("8254 PIT: Failed to hook IO ports\n");
-	v3_detach_device(dev);
+	v3_remove_device(dev);
 	return -1;
     }
 
-#ifdef CONFIG_DEBUG_PIT
+#ifdef V3_CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ);
     //PrintTrace(reload_val);
     PrintDebug("\n");
@@ -712,7 +774,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     pit_state->timer = v3_add_timer(info, &timer_ops, pit_state);
 
     if (pit_state->timer == NULL) {
-	v3_detach_device(dev);
+	v3_remove_device(dev);
 	return -1;
     }
 
@@ -727,7 +789,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     init_channel(&(pit_state->ch_1));
     init_channel(&(pit_state->ch_2));
 
-#ifdef CONFIG_DEBUG_PIT
+#ifdef V3_CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000);
     //PrintTraceLL(pit_state->pit_counter);
     PrintDebug("\n");