#include <palacios/vmm_types.h>
#include <palacios/vmm.h>
#include <palacios/vmm_dev_mgr.h>
+#include <palacios/vm_guest.h>
#ifndef CONFIG_DEBUG_PIC
#undef PrintDebug
pic_state_t master_state;
pic_state_t slave_state;
+
+ struct guest_info * core;
+
+
+ void * router_handle;
+ void * controller_handle;
};
return -1;
}
+#ifdef CONFIG_MULTITHREAD_OS
v3_interrupt_cpu(vm, 0, 0);
+#endif
return 0;
}
+static int pic_free(struct pic_internal * state) {
+ struct guest_info * core = state->core;
+ v3_remove_intr_controller(core, state->controller_handle);
+ v3_remove_intr_router(core->vm_info, state->router_handle);
-
-static int pic_free(struct vm_device * dev) {
-
+ V3_Free(state);
return 0;
}
-
-
-
-
-
static struct v3_device_ops dev_ops = {
- .free = pic_free,
+ .free = (int (*)(void *))pic_free,
};
-#include <palacios/vm_guest.h>
+
static int pic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
struct pic_internal * state = NULL;
- state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
char * dev_id = v3_cfg_val(cfg, "ID");
+ int ret = 0;
// PIC is only usable in non-multicore environments
// just hardcode the core context
struct guest_info * core = &(vm->cores[0]);
+
+ state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
V3_ASSERT(state != NULL);
- struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
- if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", dev_id);
+ if (dev == NULL) {
+ PrintError("Could not add device %s\n", dev_id);
+ V3_Free(state);
return -1;
}
+ state->core = core;
- v3_register_intr_controller(core, &intr_ops, state);
- v3_register_intr_router(vm, &router_ops, state);
+ state->controller_handle = v3_register_intr_controller(core, &intr_ops, state);
+ state->router_handle = v3_register_intr_router(vm, &router_ops, state);
state->master_irr = 0;
state->master_isr = 0;
state->slave_state = ICW1;
- v3_dev_hook_io(dev, MASTER_PORT1, &read_master_port1, &write_master_port1);
- v3_dev_hook_io(dev, MASTER_PORT2, &read_master_port2, &write_master_port2);
- v3_dev_hook_io(dev, SLAVE_PORT1, &read_slave_port1, &write_slave_port1);
- v3_dev_hook_io(dev, SLAVE_PORT2, &read_slave_port2, &write_slave_port2);
+ ret |= v3_dev_hook_io(dev, MASTER_PORT1, &read_master_port1, &write_master_port1);
+ ret |= v3_dev_hook_io(dev, MASTER_PORT2, &read_master_port2, &write_master_port2);
+ ret |= v3_dev_hook_io(dev, SLAVE_PORT1, &read_slave_port1, &write_slave_port1);
+ ret |= v3_dev_hook_io(dev, SLAVE_PORT2, &read_slave_port2, &write_slave_port2);
+
+ ret |= v3_dev_hook_io(dev, ELCR1_PORT, &read_elcr_port, &write_elcr_port);
+ ret |= v3_dev_hook_io(dev, ELCR2_PORT, &read_elcr_port, &write_elcr_port);
- v3_dev_hook_io(dev, ELCR1_PORT, &read_elcr_port, &write_elcr_port);
- v3_dev_hook_io(dev, ELCR2_PORT, &read_elcr_port, &write_elcr_port);
+ if (ret != 0) {
+ PrintError("Error hooking io ports\n");
+ v3_remove_device(dev);
+ return -1;
+ }
return 0;
}