make EFER hook permanent

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

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 248cf77..ffae665 100644 (file)
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -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;
@@ -127,7 +129,7 @@ struct pit_rdb_status_word {
  * This should call out to handle_SQR_WAVE_tics, etc... 
  */
 // Returns true if the the output signal changed state
-static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint_t oscillations) {
+static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t oscillations) {
     uint_t channel_cycles = 0;
     uint_t output_changed = 0;
   
@@ -239,8 +241,7 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint
 #include <palacios/vm_guest.h>
 
 static void pit_update_timer(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * private_data) {
-    struct vm_device * dev = (struct vm_device *)private_data;
-    struct pit * state = (struct pit *)dev->private_data;
+    struct pit * state = (struct pit *)private_data;
     //  ullong_t tmp_ctr = state->pit_counter;
     ullong_t tmp_cycles;
     uint_t oscillations = 0;
@@ -298,15 +299,18 @@ 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 (handle_crystal_tics(dev, &(state->ch_0), oscillations) == 1) {
+       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);
        }
 
-       //handle_crystal_tics(dev, &(state->ch_1), oscillations);
-       handle_crystal_tics(dev, &(state->ch_2), oscillations);
+       //handle_crystal_tics(state, &(state->ch_1), oscillations);
+       handle_crystal_tics(state, &(state->ch_2), oscillations);
     }
   
 
@@ -643,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) {
@@ -658,10 +662,8 @@ static int pit_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = pit_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))pit_free,
+
 
 };
 
@@ -681,12 +683,14 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     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;
@@ -700,7 +704,7 @@ 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;
     }
 
@@ -712,10 +716,10 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     
 
-    pit_state->timer = v3_add_timer(info, &timer_ops, dev);
+    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;
     }