#include <devices/apic_regs.h>
#include <palacios/vmm.h>
#include <palacios/vmm_msr.h>
-
+#include <palacios/vm_guest.h>
#ifndef CONFIG_DEBUG_APIC
#undef PrintDebug
};
+static int apic_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data);
+static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_data);
static void init_apic_state(struct apic_state * apic) {
apic->base_addr = DEFAULT_BASE_ADDR;
static int write_apic_msr(uint_t msr, v3_msr_t src, void * priv_data) {
- // struct vm_device * dev = (struct vm_device *)priv_data;
- // struct apic_state * apic = (struct apic_state *)dev->private_data;
+ struct vm_device * dev = (struct vm_device *)priv_data;
+ struct apic_state * apic = (struct apic_state *)dev->private_data;
+ struct v3_shadow_region * old_reg = v3_get_shadow_region(dev->vm, apic->base_addr);
+
+ if (old_reg == NULL) {
+ // uh oh...
+ PrintError("APIC Base address region does not exit...\n");
+ return -1;
+ }
+
+ v3_delete_shadow_region(dev->vm, old_reg);
- PrintError("WRITING APIC BASE ADDR: HI=%x LO=%x\n", src.hi, src.lo);
+ apic->base_addr = src.value;
- return -1;
+ if (v3_hook_full_mem(dev->vm, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, dev) == -1) {
+ PrintError("Could not hook new APIC Base address\n");
+ return -1;
+ }
+
+ return 0;
}
PrintDebug("Raising APIC IRQ %d\n", irq_num);
+ if (*req_location & flag) {
+ V3_Print("Interrupts coallescing\n");
+ }
+
if (*en_location & flag) {
*req_location |= flag;
} else {
return -1;
}
+ v3_interrupt_cpu(info, 0);
+
return 0;
}
apic->tmr_vec_tbl.tmr_mode, apic->tmr_init_cnt, shift_num);
if (apic_intr_pending(dev->vm, priv_data)) {
- PrintDebug("Overriding pending IRQ %d\n", apic_get_intr_number(priv_data));
+ PrintDebug("Overriding pending IRQ %d\n", apic_get_intr_number(dev->vm, priv_data));
}
if (activate_internal_irq(apic, APIC_TMR_INT) == -1) {
-static int apic_init(struct guest_info * vm, void * cfg_data) {
+static int apic_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
PrintDebug("Creating APIC\n");
+ char * name = v3_cfg_val(cfg, "name");
struct apic_state * apic = (struct apic_state *)V3_Malloc(sizeof(struct apic_state));
- struct vm_device * dev = v3_allocate_device("LAPIC", &dev_ops, apic);
+ struct vm_device * dev = v3_allocate_device(name, &dev_ops, apic);
if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", "LAPIC");
+ PrintError("Could not attach device %s\n", name);
return -1;
}