X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=7bf6a8cc94607addd914c2ce42ca3399acbdde81;hb=dea7fd2306231d09471958e2b00499d701723e17;hp=5a78e937734cf82c0133f849f833f4197f436c91;hpb=72420d58d18ec71d4777d029daaf0c6a1c820b32;p=palacios.releases.git diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c index 5a78e93..7bf6a8c 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; @@ -642,9 +644,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 +659,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,8 +680,10 @@ 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_add_device(vm, dev_id, &dev_ops, pit_state);