X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=51316bbe5073cb33c89cd751eef0bcd4f89bf3f4;hb=6593ee3c311ec87304c7bed52a9e6034338679fb;hp=242d63b4a099072b9e9da061948200a34810c7fa;hpb=56f8088296ee4116a4811a2f4f843edd80a7748d;p=palacios.releases.git diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index 242d63b..51316bb 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -1,5 +1,22 @@ -/* (c) 2008, Jack Lange */ -/* (c) 2008, The V3VEE Project */ +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include #include @@ -149,13 +166,14 @@ int v3_lower_irq(struct guest_info * info, int irq) { PrintDebug("[v3_lower_irq]\n"); - // if ((info->intr_state.controller) && - // (info->intr_state.controller->raise_intr)) { + if ((info->intr_state.controller) && + (info->intr_state.controller->raise_intr)) { info->intr_state.controller->lower_intr(info->intr_state.controller_state, irq); - //} else { - // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n"); - // return -1; - //} + } else { + PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n"); + return -1; + } + return 0; } @@ -167,13 +185,14 @@ int v3_raise_irq(struct guest_info * info, int irq) { PrintDebug("[v3_raise_irq]\n"); - // if ((info->intr_state.controller) && - // (info->intr_state.controller->raise_intr)) { + if ((info->intr_state.controller) && + (info->intr_state.controller->raise_intr)) { info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq); - //} else { - // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n"); - // return -1; - //} + } else { + PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n"); + return -1; + } + return 0; }