struct v3_timer * timer;
+ struct v3_vm_info * vm;
+
struct channel ch_0;
struct channel ch_1;
struct channel ch_2;
-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) {
static struct v3_device_ops dev_ops = {
- .free = pit_free,
+ .free = (int (*)(void *))pit_free,
};
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;
if (ret != 0) {
PrintError("8254 PIT: Failed to hook IO ports\n");
- v3_detach_device(dev);
+ v3_remove_device(dev);
return -1;
}
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;
}