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

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 028357f..ffae665 100644
--- 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;
@@ -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) {
@@ -657,7 +662,7 @@ static int pit_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = pit_free,
+    .free = (int (*)(void *))pit_free,
 
 
 };
@@ -678,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;
@@ -697,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,7 +719,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;
     }