build fix and configuration cleanup

[palacios.git] / palacios / src / devices / 8254.c

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index ffae665..b945d2b 100644 (file)
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -660,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>
@@ -679,7 +734,7 @@ 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));